From d0a9933050f9f3a256671978c22bdf40862e2090 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Mon, 30 Jun 2025 17:50:21 +0800 Subject: [PATCH] disable compat build --- ...on-t-add-extra-libraries-for-linking.patch | 16 +------ backport-0002-setup_py_extra_opts.patch | 12 ------ gpgme-1.24.3.tar.bz2 | 3 -- gpgme.spec | 43 +++---------------- 4 files changed, 7 insertions(+), 67 deletions(-) delete mode 100644 backport-0002-setup_py_extra_opts.patch delete mode 100644 gpgme-1.24.3.tar.bz2 diff --git a/0001-don-t-add-extra-libraries-for-linking.patch b/0001-don-t-add-extra-libraries-for-linking.patch index 39298db..8dbbb2f 100644 --- a/0001-don-t-add-extra-libraries-for-linking.patch +++ b/0001-don-t-add-extra-libraries-for-linking.patch @@ -5,23 +5,9 @@ Subject: [PATCH] don't add extra libraries for linking Signed-off-by: Igor Gnatenko --- - lang/cpp/src/GpgmeppConfig.cmake.in.in | 2 +- src/gpgme-config.in | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) + 1 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in -index 73f5eaad..3104d715 100644 ---- a/lang/cpp/src/GpgmeppConfig.cmake.in.in -+++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in -@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED) - - set_target_properties(Gpgmepp PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@" -- INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@" -+ INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@" - IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp@libsuffix@" - ) - diff --git a/src/gpgme-config.in b/src/gpgme-config.in index a4d152e1..6a854e4a 100644 --- a/src/gpgme-config.in diff --git a/backport-0002-setup_py_extra_opts.patch b/backport-0002-setup_py_extra_opts.patch deleted file mode 100644 index dbcd4a7..0000000 --- a/backport-0002-setup_py_extra_opts.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/lang/python/Makefile.in b/lang/python/Makefile.in -index c0fc091..d567ecb 100644 ---- a/lang/python/Makefile.in -+++ b/lang/python/Makefile.in -@@ -802,6 +802,7 @@ install-exec-local: - --build-base="$$(basename "$${PYTHON}")-gpg" \ - install \ - --prefix "$(DESTDIR)$(prefix)" \ -+ $${SETUP_PY_EXTRA_OPTS:-} \ - --verbose ; \ - done - diff --git a/gpgme-1.24.3.tar.bz2 b/gpgme-1.24.3.tar.bz2 deleted file mode 100644 index d28d206..0000000 --- a/gpgme-1.24.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bfc17f5bd1b178c8649fdd918956d277080f33df006a2dc40acdecdce68c50dd -size 1892862 diff --git a/gpgme.spec b/gpgme.spec index 224fe57..ee8edbc 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -1,25 +1,15 @@ -%bcond_without build_compat - -%if %{with build_compat} -%define compat_version 1.24.3 -%endif - Name: gpgme Version: 2.0.0 -Release: 1 +Release: 2 Summary: GnuPG Made Easy License: LGPL-2.1-or-later AND MIT URL: https://gnupg.org/related_software/gpgme/ Source0: https://gnupg.org/ftp/gcrypt/gpgme/gpgme-%{version}.tar.bz2 -%if %{with build_compat} -Source10: https://gnupg.org/ftp/gcrypt/gpgme/gpgme-%{compat_version}.tar.bz2 -%endif -# Don't add extra libs/cflags in gpgme-config/cmake equivalent +# Don't add extra libs/cflags in gpgme-config equivalent Patch0: 0001-don-t-add-extra-libraries-for-linking.patch # add -D_FILE_OFFSET_BITS... to gpgme-config, upstreamable Patch1: gpgme-1.3.2-largefile.patch -Patch3: backport-0002-setup_py_extra_opts.patch BuildRequires: make gcc BuildRequires: gnupg2 >= 2.2.24 @@ -46,37 +36,16 @@ Requires: libgpg-error-devel >= 1.47 %package_help %prep -%setup -qn %{name}-%{version} -%patch -P1 -p1 - -%if %{with build_compat} -%{__rpmuncompress} -x %{S:10} -pushd gpgme-%{compat_version} -%autopatch -p1 -popd -%endif +%autosetup -p1 -n %{name}-%{version} %build %configure --disable-static --disable-silent-rules --enable-languages="" %make_build -%if %{with build_compat} -pushd gpgme-%{compat_version} -%configure --disable-static --disable-silent-rules --enable-languages="" -%make_build -popd -%endif - %install %make_install %delete_la -%if %{with build_compat} -pushd gpgme-%{compat_version} -install -m0755 src/.libs/libgpgme.so.* %{buildroot}%{_libdir}/ -popd -%endif - # Delete unpackaged files rm -fv %{buildroot}%{_infodir}/dir @@ -88,9 +57,6 @@ rm -fv %{buildroot}%{_infodir}/dir %doc AUTHORS ChangeLog NEWS README THANKS TODO VERSION %{_bindir}/%{name}-json %{_libdir}/lib%{name}.so.45* -%if %{with build_compat} -%{_libdir}/lib%{name}.so.11* -%endif %files devel %{_bindir}/%{name}-config @@ -106,6 +72,9 @@ rm -fv %{buildroot}%{_infodir}/dir %{_mandir}/man?/* %changelog +* Mon Jun 30 2025 Funda Wang - 2.0.0-2 +- disable compat build + * Sun Jun 29 2025 Funda Wang - 2.0.0-1 - update to 2.0.0 -- Gitee