# 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 != "rawhide"; 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 $rightmost *.spec
+ # Add the new commit.
+ if ! grep -sq "^%%autochangelog" $specfile; then
+ # If we're not building for Rawhide then we must use the
+ # rpmdev-bumpspec rightmost (-r) flag so there's an upgrade
+ # path to Rawhide.
+ rightmost=
+ if test %fedora-branch != "rawhide"; 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 $rightmost *.spec
+ else
+ rpmdev-bumpspec -c "- Bump release and rebuild" $rightmost *.spec
+ fi
+
+ fedpkg commit -c
else
- rpmdev-bumpspec -c "- Bump release and rebuild." $rightmost *.spec
+ # Using autochangelog.
+ if ! git log | grep -sq %fedora-rebuild-name; then
+ git commit --allow-empty -m %fedora-rebuild-name
+ else
+ git commit --allow-empty -m "Bump release and rebuild"
+ fi
fi
- # Commit and push the change.
- fedpkg commit -c
+ # Push the new commit.
fedpkg push
# Do the Koji build in the side tag.
# list of binary packages they build, so work this out in advance.
declare -A bin2src
for p in %fedora-source-packages; do
- for b in $(rpmspec -q --provides %fedora-dir/$p/%fedora-branch/$p.spec 2>/dev/null | awk '{print $1}'); do
- bin2src[$b]=$p
- done
+ p_specfile=%fedora-dir/$p/%fedora-branch/$p.spec
+ p_depcache=%fedora-dir/$p/%fedora-branch/.depcache
+ if ! test -f "$p_depcache" || test "$p_specfile" -nt "$p_depcache";
+ then
+ rm -f $p_depcache
+ for b in $(rpmspec -q --provides $p_specfile 2>/dev/null | awk '{print $1}'); do
+ echo "bin2src['$b']='$p'" >> $p_depcache
+ done
+ fi
+ source $p_depcache
done
for b in $(rpmspec -q --buildrequires $specfile 2>/dev/null |