From 301483c22da0d52da9976e236a9f7f2b89433cef Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Oct 03 2024 22:09:48 +0000 Subject: small version_no_tilde change with this, hopefully cosmic-term is finally ready upstream Signed-off-by: Ryan Brue --- diff --git a/scripts/srpm.sh b/scripts/srpm.sh index 6398883..28c7f6a 100755 --- a/scripts/srpm.sh +++ b/scripts/srpm.sh @@ -88,8 +88,8 @@ if [ "$NIGHTLY" -eq 1 ]; then sed -i "/^%global commit / s/.*/%global commit $COMMIT/" $NAME.spec else sed -i "/^Version: / s/.*/Version: $VERSION/" $NAME.spec - # Replace shortcommit with version_no_tilde - sed -i "/^%global shortcommit / s/.*/%global version_no_tilde $VERSION_NO_TILDE/" $NAME.spec + # Replace shortcommit with version_no_tilde and delete shortcommit def. version_no_tilde is predefined by rpm macros + sed -i "/^%global shortcommit /d" $NAME.spec sed -i "s/%{shortcommit}/%{version_no_tilde}/g" $NAME.spec # Delete commitdate, we don't need it here sed -i "/^%global commitdate /d" $NAME.spec