diff --git a/0002-don-t-add-extra-libraries-for-linking.patch b/0002-don-t-add-extra-libraries-for-linking.patch new file mode 100644 index 0000000000000000000000000000000000000000..39298db1761b754b7370d8bf9d709cc3dda7d034 --- /dev/null +++ b/0002-don-t-add-extra-libraries-for-linking.patch @@ -0,0 +1,47 @@ +From 07a8ac908cbadb22c344895ebf9cc00c6a8fd3f7 Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Wed, 29 Mar 2017 07:05:41 +0200 +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(-) + +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 ++++ b/src/gpgme-config.in +@@ -22,12 +22,12 @@ cflags="-I@includedir@" + libs="-L@libdir@" + + # Network libraries. +-assuan_cflags="@LIBASSUAN_CFLAGS@" +-assuan_libs="@LIBASSUAN_LIBS@" ++#assuan_cflags="@LIBASSUAN_CFLAGS@" ++#assuan_libs="@LIBASSUAN_LIBS@" + + # Configure libgpg-error. + gpg_error_cflags="@GPG_ERROR_CFLAGS@" +-gpg_error_libs="@GPG_ERROR_LIBS@" ++#gpg_error_libs="@GPG_ERROR_LIBS@" + + # Configure thread packages. + thread_modules="" +-- +2.15.1 + diff --git a/gpgme-1.17.0.tar.bz2 b/gpgme-1.17.0.tar.bz2 deleted file mode 100644 index 5e296e4d48cd4d61d83787864e16c2c8b6ec7c14..0000000000000000000000000000000000000000 Binary files a/gpgme-1.17.0.tar.bz2 and /dev/null differ diff --git a/gpgme-1.18.0.tar.bz2 b/gpgme-1.18.0.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..69cc52743232e34a5561e0d73cb93e130661945b Binary files /dev/null and b/gpgme-1.18.0.tar.bz2 differ diff --git a/gpgme.spec b/gpgme.spec index a8f1cb9caf9a1dcfe76886adad39ea84ea55b398..250839322d97ac864a597e21375d2dce7a8343da 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -7,7 +7,7 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API -Version: 1.17.0 +Version: 1.18.0 Release: %{anolis_release}%{?dist} # MIT: src/cJSON.{c,h} (used by gpgme-json) @@ -16,6 +16,7 @@ URL: https://gnupg.org/related_software/gpgme/ Source0: https://gnupg.org/ftp/gcrypt/gpgme/gpgme-%{version}.tar.bz2 Patch1000: 0001-fix-stupid-ax_python_devel.patch +Patch1001: 0002-don-t-add-extra-libraries-for-linking.patch BuildRequires: make BuildRequires: gcc @@ -41,10 +42,17 @@ easier for applications. It provides a high-level crypto API for encryption, decryption, signing, signature verification and key management. +%package doc +Summary: Doc files for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +Doc files for %{name} + %package devel Summary: Development headers and libraries for %{name} -Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: libgpg-error-devel%{?_isa} >= %{libgpg_error_min_ver} +Requires: %{name} = %{version}-%{release} %description devel %{summary}. @@ -52,9 +60,8 @@ Requires: libgpg-error-devel%{?_isa} >= %{libgpg_error_min_ver} %package -n %{name}pp Summary: C++ bindings/wrapper for GPGME Obsoletes: gpgme-pp < 1.8.0-7 -Provides: gpgme-pp = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: gpgme-pp%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: gpgme-pp = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description -n %{name}pp %{summary}. @@ -62,19 +69,16 @@ Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %package -n %{name}pp-devel Summary: Development libraries and header files for %{name}-pp Obsoletes: gpgme-pp-devel < 1.8.0-7 -Provides: gpgme-pp-devel = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: gpgme-pp-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: %{name}pp%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: %{name}-devel%{?_isa} -# For automatic provides -BuildRequires: cmake +Provides: gpgme-pp-devel = %{version}-%{release} +Requires: %{name}pp = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} %description -n %{name}pp-devel %{summary} %package -n q%{name} Summary: Qt API bindings/wrapper for GPGME -Requires: %{name}pp%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}pp%{?_isa} = %{version}-%{release} BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Test) @@ -84,8 +88,8 @@ BuildRequires: pkgconfig(Qt5Test) %package -n q%{name}-devel Summary: Development libraries and header files for %{name} Conflicts: kdepimlibs-devel < 4.14.10-17 -Requires: q%{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: %{name}pp-devel%{?_isa} +Requires: q%{name} = %{version}-%{release} +Requires: %{name}pp-devel BuildRequires: cmake %description -n q%{name}-devel @@ -95,7 +99,7 @@ BuildRequires: cmake Summary: %{name} bindings for Python 3 %{?python_provide:%python_provide python3-gpg} BuildRequires: python3-devel -Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name} = %{version}-%{release} Obsoletes: platform-python-gpg < %{version}-%{release} %description -n python3-gpg @@ -104,11 +108,6 @@ Obsoletes: platform-python-gpg < %{version}-%{release} %prep %autosetup -p1 -## HACK ALERT -# The config script already suppresses the -L if it's /usr/lib, so cheat and -# set it to a value which we know will be suppressed. -sed -i -e 's|^libdir=@libdir@$|libdir=@exec_prefix@/lib|g' src/gpgme-config.in - sed -i 's/3.8/%{python3_version}/g' configure %build @@ -117,22 +116,12 @@ export CXXFLAGS='%{optflags} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' export CFLAGS="$(echo ${CFLAGS} | tr '\n\\' ' ')" export CXXFLAGS="$(echo ${CXXFLAGS} | tr '\n\\' ' ')" - %configure --disable-static --disable-silent-rules --enable-languages=cpp,qt,python %make_build %install %make_install -# unpackaged files -rm -fv %{buildroot}%{_infodir}/dir -rm -fv %{buildroot}%{_libdir}/lib*.la - -chrpath -d %{buildroot}%{_bindir}/%{name}-tool -chrpath -d %{buildroot}%{_bindir}/%{name}-json -chrpath -d %{buildroot}%{_libdir}/lib%{name}pp.so* -chrpath -d %{buildroot}%{_libdir}/libq%{name}.so* - rm -vf %{buildroot}%{python2_sitelib}/gpg/install_files.txt rm -vf %{buildroot}%{python3_sitelib}/gpg/install_files.txt @@ -143,17 +132,15 @@ make check %files %license COPYING* LICENSES -%doc AUTHORS NEWS README* %{_bindir}/%{name}-json %{_libdir}/lib%{name}.so.11* +%files doc +%doc AUTHORS NEWS README* + %files devel %{_bindir}/%{name}-config %{_bindir}/%{name}-tool -%ifarch %{multilib_arches} -%{_bindir}/%{name}-config.%{_target_cpu} -%{_includedir}/%{name}-%{__isa_bits}.h -%endif %{_includedir}/%{name}.h %{_libdir}/lib%{name}.so %{_datadir}/aclocal/%{name}.m4 @@ -165,16 +152,16 @@ make check %{_libdir}/lib%{name}pp.so.6* %files -n %{name}pp-devel -%{_includedir}/%{name}++/ +%{_includedir}/%{name}++ %{_libdir}/lib%{name}pp.so -%{_libdir}/cmake/Gpgmepp/ +%{_libdir}/cmake/Gpgmepp %files -n q%{name} %doc lang/qt/README -%{_libdir}/libq%{name}.so.7* +%{_libdir}/libq%{name}.so.15* %files -n q%{name}-devel -%{_includedir}/q%{name}/ +%{_includedir}/q%{name} %{_includedir}/QGpgME/ %{_libdir}/libq%{name}.so %{_libdir}/cmake/QGpgme/ @@ -185,7 +172,10 @@ make check %{python3_sitearch}/gpg/ %changelog +* Tue Oct 11 2022 Funda Wang - 1.18.0-1 +- New version 1.18.0 +- Add patch from fedora for removal overlinking in gpgme-config + * Fri Mar 11 2022 liuzhilin - 1.17.0-1 - Init for Anolis OS 23 - fix stupid-ax_python_devel -