[packages/gpgme] up to 1.21.0

[atler]

commit 05072eda0524abae6e43773bdb30fc3713c7dea7
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Jul 10 20:36:59 2023 +0200

    up to 1.21.0
    
    - kill tests patch no longer necessary
    - major.minor.micro-unknown no longer supported for python modules (new
      packaning version?) so add patch that sets version as set in
      distribution tarball based on VERSION file presence (-unknown suffix
      added during autotools rerun due to missing git repository)

 gpgme-kill-tests.patch | 17 -----------------
 gpgme.spec             | 10 +++++-----
 orig-version.patch     | 14 ++++++++++++++
 3 files changed, 19 insertions(+), 22 deletions(-)
---
diff --git a/gpgme.spec b/gpgme.spec
index 5156a42..bd53ec8 100644
--- a/gpgme.spec
+++ b/gpgme.spec
@@ -24,15 +24,15 @@
 Summary:	Library for accessing GnuPG
 Summary(pl.UTF-8):	Biblioteka dająca dostęp do funkcji GnuPG
 Name:		gpgme
-Version:	1.20.0
+Version:	1.21.0
 Release:	1
 Epoch:		1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	ftp://ftp.gnupg.org/gcrypt/gpgme/%{name}-%{version}.tar.bz2
-# Source0-md5:	526949233610f46655741cafd09e66a7
+# Source0-md5:	3a83288e753a7da53a5626d29e4416fd
 Patch0:		%{name}-info.patch
-Patch1:		%{name}-kill-tests.patch
+Patch1:		orig-version.patch
 Patch2:		%{name}-largefile.patch
 Patch3:		%{name}-python.patch
 Patch4:		0001-fix-stupid-ax_python_devel.patch
@@ -451,7 +451,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{py_sitedir}/gpg/_gpgme.so
 %{py_sitedir}/gpg/*.py[co]
 %{py_sitedir}/gpg/constants
-%{py_sitedir}/gpg-%{version}_unknown-py*.egg-info
+%{py_sitedir}/gpg-%{version}-py*.egg-info
 %endif
 
 %if %{with python3}
@@ -463,5 +463,5 @@ rm -rf $RPM_BUILD_ROOT
 %{py3_sitedir}/gpg/*.py
 %{py3_sitedir}/gpg/__pycache__
 %{py3_sitedir}/gpg/constants
-%{py3_sitedir}/gpg-%{version}_unknown-py*.egg-info
+%{py3_sitedir}/gpg-%{version}-py*.egg-info
 %endif
diff --git a/gpgme-kill-tests.patch b/gpgme-kill-tests.patch
deleted file mode 100644
index 1b49444..0000000
--- a/gpgme-kill-tests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- gpgme-1.12.0/lang/python/Makefile.am.orig	2018-10-05 15:17:05.000000000 +0200
-+++ gpgme-1.12.0/lang/python/Makefile.am	2018-10-18 21:49:34.447090074 +0200
-@@ -25,7 +25,13 @@
- 	gpgme.i \
- 	helpers.c helpers.h private.h
- 
--SUBDIRS = . tests examples doc src
-+if RUN_GPG_TESTS
-+tests = tests
-+else
-+tests =
-+endif
-+
-+SUBDIRS = . ${tests} examples doc src
- 
- .PHONY: prepare
- prepare: copystamp
diff --git a/orig-version.patch b/orig-version.patch
new file mode 100644
index 0000000..29e74d8
--- /dev/null
+++ b/orig-version.patch
@@ -0,0 +1,14 @@
+--- gpgme-1.21.0/autogen.sh.orig	2023-03-15 16:05:10.000000000 +0100
++++ gpgme-1.21.0/autogen.sh	2023-07-10 20:26:10.388981298 +0200
+@@ -266,6 +266,11 @@
+       [ -n "$tmp" ] && beta=yes
+       rev=$(git rev-parse --short HEAD | tr -d '\n\r')
+       rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null)))
++    elif [ -f VERSION ]; then
++      ingit=no
++      tmp=
++      rev="0000000"
++      rvd="0"
+     else
+       ingit=no
+       beta=yes
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gpgme.git/commitdiff/05072eda0524abae6e43773bdb30fc3713c7dea7