From 63de2206c9def0a04df7705272084318341cdc1436dbf5380477f443e5a34dc0 Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Thu, 19 Oct 2023 07:34:37 +0000 Subject: [PATCH] Accepting request 1118293 from home:pmonrealgonzalez:branches:devel:libraries:c_c++ - Do not pull revision info from GIT when autoconf is run. This removes the -unknown suffix after the version number. * Add libgcrypt-nobetasuffix.patch [bsc#1216334] OBS-URL: https://build.opensuse.org/request/show/1118293 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libgcrypt?expand=0&rev=172 --- libgcrypt-nobetasuffix.patch | 24 ++++++++++++++++++++++++ libgcrypt.changes | 7 +++++++ libgcrypt.spec | 2 ++ 3 files changed, 33 insertions(+) create mode 100644 libgcrypt-nobetasuffix.patch diff --git a/libgcrypt-nobetasuffix.patch b/libgcrypt-nobetasuffix.patch new file mode 100644 index 0000000..3d4593a --- /dev/null +++ b/libgcrypt-nobetasuffix.patch @@ -0,0 +1,24 @@ +Index: libgcrypt-1.10.2/autogen.sh +=================================================================== +--- libgcrypt-1.10.2.orig/autogen.sh ++++ libgcrypt-1.10.2/autogen.sh +@@ -249,7 +249,7 @@ if [ "$myhost" = "find-version" ]; then + fi + + 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"//) +@@ -265,8 +265,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/libgcrypt.changes b/libgcrypt.changes index 9d552b4..099f5d6 100644 --- a/libgcrypt.changes +++ b/libgcrypt.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 libgcrypt-nobetasuffix.patch [bsc#1216334] + ------------------------------------------------------------------- Tue Oct 3 12:58:41 UTC 2023 - Pedro Monreal diff --git a/libgcrypt.spec b/libgcrypt.spec index 2b8c52b..b40fba5 100644 --- a/libgcrypt.spec +++ b/libgcrypt.spec @@ -37,6 +37,8 @@ Source99: libgcrypt.changes Patch1: libgcrypt-1.10.0-allow_FSM_same_state.patch #PATCH-FIX-SUSE bsc#1182983 gpg: out of core handler ignored in FIPS mode while typing Tab key to Auto-Completion Patch2: libgcrypt-1.10.0-out-of-core-handler.patch +#PATCH-FIX-OPENSUSE Do not pull revision info from GIT when autoconf is run +Patch3: libgcrypt-nobetasuffix.patch # FIPS patches: #PATCH-FIX-SUSE bsc#1190700 FIPS: Provide a service-level indicator for PK Patch100: libgcrypt-FIPS-SLI-pk.patch