From 2b25d40fd830245c6bccff29e76d9f91526cfb996a2234b64d26b53ace57aef4 Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Thu, 19 Oct 2023 07:34:20 +0000 Subject: [PATCH] Accepting request 1118292 from home:pmonrealgonzalez:branches:Base:System - Do not pull revision info from GIT when autoconf is run. This removes the -unknown suffix after the version number. * Add libgpg-error-nobetasuffix.patch [bsc#1216334] OBS-URL: https://build.opensuse.org/request/show/1118292 OBS-URL: https://build.opensuse.org/package/show/Base:System/libgpg-error?expand=0&rev=102 --- libgpg-error-nobetasuffix.patch | 24 ++++++++++++++++++++++++ libgpg-error.changes | 7 +++++++ libgpg-error.spec | 2 ++ 3 files changed, 33 insertions(+) create mode 100644 libgpg-error-nobetasuffix.patch diff --git a/libgpg-error-nobetasuffix.patch b/libgpg-error-nobetasuffix.patch new file mode 100644 index 0000000..ddde5ed --- /dev/null +++ b/libgpg-error-nobetasuffix.patch @@ -0,0 +1,24 @@ +Index: libgpg-error-1.47/autogen.sh +=================================================================== +--- libgpg-error-1.47.orig/autogen.sh ++++ libgpg-error-1.47/autogen.sh +@@ -243,7 +243,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) + if [ -n "$tmp" ]; then +@@ -268,8 +268,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/libgpg-error.changes b/libgpg-error.changes index 27ee1f1..eff9110 100644 --- a/libgpg-error.changes +++ b/libgpg-error.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 libgpg-error-nobetasuffix.patch [bsc#1216334] + ------------------------------------------------------------------- Wed Apr 12 11:43:52 UTC 2023 - Pedro Monreal diff --git a/libgpg-error.spec b/libgpg-error.spec index eb936ae..64da20c 100644 --- a/libgpg-error.spec +++ b/libgpg-error.spec @@ -28,6 +28,8 @@ Source1: https://gnupg.org/ftp/gcrypt/libgpg-error/%{name}-%{version}.tar # http://www.gnupg.org/signature_key.en.html Source2: %{name}.keyring Source3: baselibs.conf +#PATCH-FIX-OPENSUSE Do not pull revision info from GIT when autoconf is run +Patch0: libgpg-error-nobetasuffix.patch BuildRequires: libtool BuildRequires: pkgconfig