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
This commit is contained in:
Dirk Mueller 2022-11-09 09:19:16 +00:00 committed by Git OBS Bridge
parent 25a5ebf3c4
commit dd51d31562
3 changed files with 29 additions and 2 deletions

View File

@ -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

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Nov 8 18:35:11 UTC 2022 - Ben Greiner <code@bnavigator.de>
- Add gpgme-suse-nobetasuffix.patch
* remove "-unknown" suffix from version string
* boo#1205197
-------------------------------------------------------------------
Thu Aug 18 20:30:13 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>

View File

@ -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}