Accepting request 1227358 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1227358
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpgme?expand=0&rev=109

gpgme-fix-python-install.patch

@@ -0,0 +1,28 @@
+Index: gpgme-1.24.0/lang/python/Makefile.am
+===================================================================
+--- gpgme-1.24.0.orig/lang/python/Makefile.am
++++ gpgme-1.24.0/lang/python/Makefile.am
+@@ -96,7 +96,8 @@ install-exec-local:
+ 	  build \
+ 	  --build-base="$$(basename "$${PYTHON}")-gpg" \
+ 	  install \
+-	  --prefix "$(DESTDIR)$(prefix)" \
++	  --root "$(DESTDIR)" \
++	  --prefix "$(prefix)" \
+ 	  --verbose ; \
+ 	done
+ 
+Index: gpgme-1.24.0/lang/python/Makefile.in
+===================================================================
+--- gpgme-1.24.0.orig/lang/python/Makefile.in
++++ gpgme-1.24.0/lang/python/Makefile.in
+@@ -818,7 +818,8 @@ install-exec-local:
+ 	  build \
+ 	  --build-base="$$(basename "$${PYTHON}")-gpg" \
+ 	  install \
+-	  --prefix "$(DESTDIR)$(prefix)" \
++	  --root "$(DESTDIR)" \
++	  --prefix "$(prefix)" \
+ 	  --verbose ; \
+ 	done
+ 

gpgme.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 29 07:47:13 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add gpgme-fix-python-install.patch: Fix the installation of the
+  python bindings without having to move them around manually.
+
 -------------------------------------------------------------------
 Wed Nov 20 12:14:56 UTC 2024 - Pedro Monreal <pmonreal@suse.com>
 

gpgme.spec

@@ -58,6 +58,7 @@ Source99:       gpgme.changes
 # PATCH-FIX-OPENSUSE gpgme-suse-nobetasuffix.patch code@bnavigator.de -- remove "-unknown" betasuffix boo#1205197
 Patch2:         gpgme-suse-nobetasuffix.patch
 Patch3:         python313.patch
+Patch4:         gpgme-fix-python-install.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc-c++
@@ -316,14 +317,6 @@ rm -r %{buildroot}%{_mandir}/man1/gpgme-json.*
 %endif
 popd
 
-%if %{with python3}
-# Move the gpg directory out of the newly added egg upstream directory
-%if 0%{?suse_version} > 1500
-%python_expand mv %{buildroot}%{$python_sitearch}/gpg-%{version}*.egg/gpg %{buildroot}%{$python_sitearch}/gpg
-%python_expand rm -rf %{buildroot}%{$python_sitearch}/gpg-%{version}*.egg
-%endif
-%endif
-
 %check
 GPGME_DEBUG=2:mygpgme.log %make_build check skip=%{?qt_skip:%{qt_skip}} || cat $(find -name mygpgme.log -type f)
 
@@ -382,10 +375,8 @@ GPGME_DEBUG=2:mygpgme.log %make_build check skip=%{?qt_skip:%{qt_skip}} || cat $
 %files %{python_files gpg}
 %license COPYING COPYING.LESSER LICENSES
 %{python_sitearch}/gpg
-%if 0%{?suse_version} <= 1500
 %{python_sitearch}/gpg-%{version}*.egg-info
 %endif
-%endif
 
 %if %{with qt}
 %files -n libqgpgme15