From dd51d31562a08b44fe5b705b496b3212485c7c672285f750d64165b03d79b28e Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 9 Nov 2022 09:19:16 +0000 Subject: [PATCH] Accepting request 1034607 from home:bnavigator:branches:Base:System - Add gpgme-suse-nobetasuffix.patch * remove "-unknown" suffix from version string * boo#1205197 OBS-URL: https://build.opensuse.org/request/show/1034607 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpgme?expand=0&rev=139 --- gpgme-suse-nobetasuffix.patch | 14 ++++++++++++++ gpgme.changes | 7 +++++++ gpgme.spec | 10 ++++++++-- 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 gpgme-suse-nobetasuffix.patch diff --git a/gpgme-suse-nobetasuffix.patch b/gpgme-suse-nobetasuffix.patch new file mode 100644 index 0000000..87dc8ce --- /dev/null +++ b/gpgme-suse-nobetasuffix.patch @@ -0,0 +1,14 @@ +Index: gpgme-1.18.0/autogen.sh +=================================================================== +--- gpgme-1.18.0.orig/autogen.sh ++++ gpgme-1.18.0/autogen.sh +@@ -265,8 +265,7 @@ if [ "$myhost" = "find-version" ]; then + rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null))) + else + ingit=no +- beta=yes +- tmp="-unknown" ++ tmp="" + rev="0000000" + rvd="0" + fi diff --git a/gpgme.changes b/gpgme.changes index 018693e..0682134 100644 --- a/gpgme.changes +++ b/gpgme.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 8 18:35:11 UTC 2022 - Ben Greiner + +- Add gpgme-suse-nobetasuffix.patch + * remove "-unknown" suffix from version string + * boo#1205197 + ------------------------------------------------------------------- Thu Aug 18 20:30:13 UTC 2022 - Andreas Stieger diff --git a/gpgme.spec b/gpgme.spec index b14738d..e7ab45d 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -49,6 +49,8 @@ Patch3: gpgme-D545-python310.patch Patch4: gpgme-D546-python310.patch # PATCH-FIX-UPSTREAM fix qt tests -- https://dev.gnupg.org/T6137 Patch5: gpgme-1.18.0-T6137-qt_test.patch +# PATCH-FIX-OPENSUSE gpgme-suse-nobetasuffix.patch code@bnavigator.de -- remove "-unknown" betasuffix boo#1205197 +Patch6: gpgme-suse-nobetasuffix.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -71,6 +73,7 @@ BuildRequires: pkgconfig(Qt5Test) %python_subpackages %else %define python_sitearch %python3_sitearch +%define python_version %python3_version %define python_files() -n python3-%{**} %endif @@ -216,6 +219,7 @@ This package contains the bindings to use the library in Qt C++ applications. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build ./autogen.sh @@ -309,13 +313,15 @@ rm -r %{buildroot}%{_libdir}/pkgconfig/gpgme* %if %{with python2} && ! 0%{?python_subpackage_only} %files -n python2-gpg %license COPYING COPYING.LESSER LICENSES -%{python_sitearch}/gpg* +%{python2_sitearch}/gpg +%{python2_sitearch}/gpg-%{version}-py%{python2_version}.egg-info %endif %if %{with python3} || ( 0%{?python_subpackage_only} && %{with python2} ) %files %{python_files gpg} %license COPYING COPYING.LESSER LICENSES -%{python_sitearch}/gpg* +%{python_sitearch}/gpg +%{python_sitearch}/gpg-%{version}-py%{python_version}.egg-info %endif %if %{with qt}