From 8da000d7f9c24b74aaa7235a3a2719e6b68555de Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Mar 02 2022 22:29:49 +0000
Subject: Adjust for rpmautospec and more packages having tagged commits


Signed-off-by: Michel Alexandre Salim <salimma@fedoraproject.org>

---

diff --git a/bump-stack.sh b/bump-stack.sh
index 48d22c3..83e3467 100755
--- a/bump-stack.sh
+++ b/bump-stack.sh
@@ -6,23 +6,26 @@ set -o pipefail
 
 VER=$1
 
-for p in folly fizz wangle fbthrift fbzmq proxygen; # watchman;
+for p in folly fizz wangle fbthrift fb303 fbzmq proxygen; # watchman;
 do
     [ -d $p ] || fedpkg clone $p
     pushd $p
     git fetch
     fedpkg switch-branch rawhide
     git rebase
-    rpmdev-bumpspec -n ${VER} -c "Update to ${VER}" $p.spec
+    if [ $p == "mcrouter" ]; then
+      sed -i "s|^%global tag .*|%global tag ${VER}|" $p.spec
+    else
+      rpmdev-bumpspec -n ${VER} $p.spec
+    fi
     rm -if *.tar.gz
     spectool -gf $p.spec
     fedpkg new-sources $p*.tar.gz || (kinit && fedpkg new-sources $p*.tar.gz)
-    sed -i "/${VER}/!d" .gitignore
     echo "Done updating ${p}. Make any manual adjustments now then press ENTER"
     read
-    fedpkg commit -cs
-    git push
+    fedpkg commit -s -m "Update to ${VER}"
+    # git push
     popd
 done
 
-echo "Remember to handle fb303, mcrouter, and wdt separately"
+echo "Remember to handle cachelib, watchman and wdt separately"