From 4d6f2455924a3f0ccd82dd1118fbdf90b29172e7 Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: May 06 2021 15:42:15 +0000 Subject: Only remove upstream and FB patches This leaves downstream patches in, including https://github.com/systemd/systemd/pull/17050 which is necessary to pass tests on recent versions of mock. --- diff --git a/systemd-cd/systemd-cd.sh b/systemd-cd/systemd-cd.sh index 084e63d..8b27bdd 100755 --- a/systemd-cd/systemd-cd.sh +++ b/systemd-cd/systemd-cd.sh @@ -40,7 +40,8 @@ version=$(echo "${last_tag#?}" | tr '-' '~') release="1.$(date +%Y%m%d).${short_commit}" changelog="$(date '+%a %b %d %Y') ${AUTHOR} - ${version}-${release}" sed -i "systemd/SPECS/systemd.spec" \ - -e "/^Patch.*/d" \ + -e "/^Patch00.*/d" \ + -e "/^Patch01.*/d" \ -e "s/^#global commit .*$/%global commit ${last_commit}/" \ -e "/^%global stable 1$/d" \ -e "s/^Version:.*$/Version: ${version}/" \