From 156de1e0df4aace1a42957491118cc2174d70c6a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 27 Feb 2020 13:14:27 +0000 Subject: [PATCH] stdlib/fedora: Use rpmdev-bumpspec -r flag for < Rawhide builds. We want to preserve the upgrade path to Rawhide. --- stdlib/fedora.gl | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/stdlib/fedora.gl b/stdlib/fedora.gl index 3b82cf6..2bcaec1 100644 --- a/stdlib/fedora.gl +++ b/stdlib/fedora.gl @@ -111,15 +111,24 @@ is-koji-built ("%pkg") : # would need to be corrected/integrated by hand. git pull + # If we're not building for Rawhide then we must use the rightmost + # (-r) flag so there's an upgrade path to Rawhide. + rightmost= + if test %fedora-branch != "master"; then rightmost=-r; fi + # If the specfile doesn't have the magic string then add # that now. if ! grep -sq %fedora-rebuild-name $specfile; then - rpmdev-bumpspec -c "- "%fedora-rebuild-name *.spec + rpmdev-bumpspec -c "- "%fedora-rebuild-name $rightmost *.spec else - rpmdev-bumpspec -c "- Bump release and rebuild." *.spec + rpmdev-bumpspec -c "- Bump release and rebuild." $rightmost *.spec fi + + # Commit and push the change. fedpkg commit -c fedpkg push + + # Do the Koji build in the side tag. fedpkg build --target %fedora-tag } -- 1.8.3.1