git.annexia.org
/
goals.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stdlib/fedora: Use rpmdev-bumpspec -r flag for < Rawhide builds.
[goals.git]
/
stdlib
/
fedora.gl
diff --git
a/stdlib/fedora.gl
b/stdlib/fedora.gl
index
3b82cf6
..
2bcaec1
100644
(file)
--- 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
# 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
# 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
else
- rpmdev-bumpspec -c "- Bump release and rebuild." *.spec
+ rpmdev-bumpspec -c "- Bump release and rebuild."
$rightmost
*.spec
fi
fi
+
+ # Commit and push the change.
fedpkg commit -c
fedpkg push
fedpkg commit -c
fedpkg push
+
+ # Do the Koji build in the side tag.
fedpkg build --target %fedora-tag
}
fedpkg build --target %fedora-tag
}