[packages/ecryptfs-utils] - force python2, versioned Obsoletes, adjusted sh patch for gpgme 2.x support; release 5

[qboosh]

commit 89ad82b48bc601a92fc78aeec657136520e7ccd1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jul 20 20:54:56 2025 +0200

    - force python2, versioned Obsoletes, adjusted sh patch for gpgme 2.x support; release 5

 ecryptfs-utils-sh.patch | 21 ++++++++++++++++-----
 ecryptfs-utils.spec     |  5 +++--
 2 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec
index b53286f..c91429d 100644
--- a/ecryptfs-utils.spec
+++ b/ecryptfs-utils.spec
@@ -7,7 +7,7 @@ Summary:	The eCryptfs mount helper and support libraries
 Summary(pl.UTF-8):	Narzędzie pomocnicze i biblioteki do montowania eCryptfs
 Name:		ecryptfs-utils
 Version:	111
-Release:	4
+Release:	5
 License:	GPL v2+
 Group:		Base
 #Source0Download: https://launchpad.net/ecryptfs/+download
@@ -106,7 +106,7 @@ Summary:	Python bindings for the eCryptfs utils
 Summary(pl.UTF-8):	Wiązania Pythona do narzędzi eCryptfs
 Group:		Libraries/Python
 Requires:	%{name} = %{version}-%{release}
-Obsoletes:	ecryptfs-utils-python
+Obsoletes:	ecryptfs-utils-python < 85-2
 
 %description -n python-ecryptfs
 This package contains a module that permits applications written in
@@ -133,6 +133,7 @@ ecryptfs-utils.
 %{__autoheader}
 %{__automake}
 %configure \
+	PYTHON=%{__python} \
 	--enable-gpg \
 	%{?with_gui:--enable-gui} \
 	--enable-nss \
diff --git a/ecryptfs-utils-sh.patch b/ecryptfs-utils-sh.patch
index d3dec9c..bab78bb 100644
--- a/ecryptfs-utils-sh.patch
+++ b/ecryptfs-utils-sh.patch
@@ -1,13 +1,24 @@
---- ecryptfs-utils-38/configure.ac.orig	2008-01-02 22:38:33.000000000 +0100
-+++ ecryptfs-utils-38/configure.ac	2008-01-13 20:16:45.171399011 +0100
-@@ -234,8 +234,8 @@
+--- ecryptfs-utils-111/configure.ac.orig	2016-02-23 23:34:08.000000000 +0100
++++ ecryptfs-utils-111/configure.ac	2025-07-20 20:44:42.221902832 +0200
+@@ -316,12 +316,18 @@ fi
+ 
+ if test "${enable_gpg}" = "yes" ; then
+ 	AC_MSG_CHECKING([for gpgme])
+-	if ! test -x "${with_gpgme_prefix}/bin/gpgme-config"; then
++	GPGME_CONFIG=no
++	if test -x "${with_gpgme_prefix}/bin/gpgme-config"; then
++		GPGME_CONFIG="${with_gpgme_prefix}/bin/gpgme-config"
++	elif test -x "${with_gpgme_prefix}/bin/gpgrt-config"; then
++		GPGME_CONFIG="${with_gpgme_prefix}/bin/gpgrt-config gpgme"
++	fi
++	if test "$GPGME_CONFIG" = "no"; then
  		AC_MSG_ERROR([Cannot locate gpgme])
  	else
  		AC_MSG_RESULT([found])
 -		GPGME_CFLAGS="`\"${with_gpgme_prefix}/bin/gpgme-config\" --cflags`"
 -		GPGME_LIBS="`\"${with_gpgme_prefix}/bin/gpgme-config\" --libs`"
-+		GPGME_CFLAGS="$("${with_gpgme_prefix}/bin/gpgme-config" --cflags)"
-+		GPGME_LIBS="$("${with_gpgme_prefix}/bin/gpgme-config" --libs)"
++		GPGME_CFLAGS="$(${GPGME_CONFIG} --cflags)"
++		GPGME_LIBS="$(${GPGME_CONFIG} --libs)"
  	fi
  fi
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ecryptfs-utils.git/commitdiff/89ad82b48bc601a92fc78aeec657136520e7ccd1