diff --git a/gnupg-nobetasuffix.patch b/gnupg-nobetasuffix.patch new file mode 100644 index 0000000..42bbb66 --- /dev/null +++ b/gnupg-nobetasuffix.patch @@ -0,0 +1,24 @@ +Index: gnupg-2.4.3/autogen.sh +=================================================================== +--- gnupg-2.4.3.orig/autogen.sh ++++ gnupg-2.4.3/autogen.sh +@@ -221,7 +221,7 @@ if [ "$myhost" = "find-version" ]; then + esac + + beta=no +- if [ -e .git ]; then ++ if false; then + ingit=yes + tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null) + tmp=$(echo "$tmp" | sed s/^"$package"//) +@@ -237,8 +237,8 @@ if [ "$myhost" = "find-version" ]; then + rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null))) + else + ingit=no +- beta=yes +- tmp="-unknown" ++ beta=no ++ tmp="" + rev="0000000" + rvd="0" + fi diff --git a/gpg2.changes b/gpg2.changes index b94d312..2db0629 100644 --- a/gpg2.changes +++ b/gpg2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Oct 17 10:27:15 UTC 2023 - Pedro Monreal + +- Do not pull revision info from GIT when autoconf is run. This + removes the -unknown suffix after the version number. + * Add gnupg-nobetasuffix.patch [bsc#1216334] + ------------------------------------------------------------------- Mon Oct 16 19:54:40 UTC 2023 - Pedro Monreal diff --git a/gpg2.spec b/gpg2.spec index ac07560..6cab790 100644 --- a/gpg2.spec +++ b/gpg2.spec @@ -46,6 +46,8 @@ Patch11: gnupg-allow-large-rsa.patch Patch12: gnupg-revert-rfc4880bis.patch #PATCH-FIX-UPSTREAM Fix emacs gpg2 output parsing Patch13: gnupg-Report-BEGIN_-status-before-examining-the-input.patch +#PATCH-FIX-OPENSUSE Do not pull revision info from GIT when autoconf is run +Patch14: gnupg-nobetasuffix.patch BuildRequires: expect BuildRequires: fdupes BuildRequires: ibmswtpm2