Compare commits
No commits in common. "imports/c8-beta/gpgme-1.13.1-7.el8" and "c8" have entirely different histories.
imports/c8
...
c8
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/gpgme-1.13.1.tar.bz2
|
SOURCES/gpgme-1.13.1.licenses.tar.bz2
|
||||||
|
@ -1 +1 @@
|
|||||||
f87f34e695e8d74ccc7c8f42864d50630afebb0e SOURCES/gpgme-1.13.1.tar.bz2
|
a33a6121d761d499716eec342fc99bcc57f6a693 SOURCES/gpgme-1.13.1.licenses.tar.bz2
|
||||||
|
31
SOURCES/gpgme-1.13.1-pkgconfig.patch
Normal file
31
SOURCES/gpgme-1.13.1-pkgconfig.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
diff --git a/src/gpgme-glib.pc.in b/src/gpgme-glib.pc.in
|
||||||
|
index bd42a31..781a463 100644
|
||||||
|
--- a/src/gpgme-glib.pc.in
|
||||||
|
+++ b/src/gpgme-glib.pc.in
|
||||||
|
@@ -7,8 +7,8 @@ api_version=@GPGME_CONFIG_API_VERSION@
|
||||||
|
|
||||||
|
Name: gpgme-glib
|
||||||
|
Description: GnuPG Made Easy to access GnuPG with Glib
|
||||||
|
-Requires: gpg-error, libassuan, glib-2.0
|
||||||
|
+Requires: glib-2.0
|
||||||
|
Version: @PACKAGE_VERSION@
|
||||||
|
-Cflags: @GPGME_CONFIG_CFLAGS@
|
||||||
|
-Libs: @GPGME_CONFIG_LIBS@
|
||||||
|
+Cflags: @GPGME_CONFIG_CFLAGS@ -I/usr/include/libassuan2
|
||||||
|
+Libs: @GPGME_CONFIG_LIBS@ -lgpg-error -lassuan
|
||||||
|
URL: https://www.gnupg.org/software/gpgme/index.html
|
||||||
|
diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in
|
||||||
|
index be288b8..a71bcf7 100644
|
||||||
|
--- a/src/gpgme.pc.in
|
||||||
|
+++ b/src/gpgme.pc.in
|
||||||
|
@@ -7,8 +7,7 @@ api_version=@GPGME_CONFIG_API_VERSION@
|
||||||
|
|
||||||
|
Name: gpgme
|
||||||
|
Description: GnuPG Made Easy to access GnuPG
|
||||||
|
-Requires: gpg-error, libassuan
|
||||||
|
Version: @PACKAGE_VERSION@
|
||||||
|
-Cflags: @GPGME_CONFIG_CFLAGS@
|
||||||
|
-Libs: @GPGME_CONFIG_LIBS@
|
||||||
|
+Cflags: @GPGME_CONFIG_CFLAGS@ -I/usr/include/libassuan2
|
||||||
|
+Libs: @GPGME_CONFIG_LIBS@ -lgpg-error -lassuan
|
||||||
|
URL: https://www.gnupg.org/software/gpgme/index.html
|
@ -17,11 +17,17 @@
|
|||||||
Name: gpgme
|
Name: gpgme
|
||||||
Summary: GnuPG Made Easy - high level crypto API
|
Summary: GnuPG Made Easy - high level crypto API
|
||||||
Version: 1.13.1
|
Version: 1.13.1
|
||||||
Release: 7%{?dist}
|
Release: 12%{?dist}
|
||||||
|
|
||||||
License: LGPLv2+ and MIT
|
# /usr/bin/gpgme-tool is licensed under GPLv3+
|
||||||
|
# the rest is licensed under LGPLv2+
|
||||||
|
# Note: /usr/bin/gpgme-json contains bits of MIT licensed code, but its
|
||||||
|
# effective license remains LGPLv2+
|
||||||
|
# (see https://fedoraproject.org/wiki/Licensing:FAQ)
|
||||||
|
License: LGPLv2+ and GPLv3+
|
||||||
URL: https://gnupg.org/related_software/gpgme/
|
URL: https://gnupg.org/related_software/gpgme/
|
||||||
Source0: https://gnupg.org/ftp/gcrypt/gpgme/gpgme-%{version}.tar.bz2
|
#Source0: https://gnupg.org/ftp/gcrypt/gpgme/gpgme-%%{version}.tar.bz2
|
||||||
|
Source0: gpgme-%{version}.licenses.tar.bz2
|
||||||
Source2: gpgme-multilib.h
|
Source2: gpgme-multilib.h
|
||||||
|
|
||||||
## downstream patches
|
## downstream patches
|
||||||
@ -37,6 +43,10 @@ Patch1004: gpgme-1.13.1-fix-resource-leaks.patch
|
|||||||
Patch1005: gpgme-build-with-gnupg-2.2.19.patch
|
Patch1005: gpgme-build-with-gnupg-2.2.19.patch
|
||||||
# Fix NULL dereference
|
# Fix NULL dereference
|
||||||
Patch1006: gpgme-1.13.1-fix-null-deref.patch
|
Patch1006: gpgme-1.13.1-fix-null-deref.patch
|
||||||
|
# Remove Requires: from pkgconfigs (rely only on rpm deps
|
||||||
|
# since both libgpg-error and libassuan have no pkgconfigs
|
||||||
|
# packaged)
|
||||||
|
Patch1007: gpgme-1.13.1-pkgconfig.patch
|
||||||
|
|
||||||
#BuildRequires: autoconf
|
#BuildRequires: autoconf
|
||||||
#BuildRequires: automake
|
#BuildRequires: automake
|
||||||
@ -72,6 +82,7 @@ management.
|
|||||||
Summary: Development headers and libraries for %{name}
|
Summary: Development headers and libraries for %{name}
|
||||||
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
Requires: libgpg-error-devel%{?_isa} >= %{libgpg_error_min_ver}
|
Requires: libgpg-error-devel%{?_isa} >= %{libgpg_error_min_ver}
|
||||||
|
Requires: libassuan-devel
|
||||||
Requires(post): /sbin/install-info
|
Requires(post): /sbin/install-info
|
||||||
Requires(postun): /sbin/install-info
|
Requires(postun): /sbin/install-info
|
||||||
|
|
||||||
@ -133,7 +144,7 @@ Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
|||||||
|
|
||||||
%description -n python2-gpg
|
%description -n python2-gpg
|
||||||
%{summary}.
|
%{summary}.
|
||||||
%endif # without python2
|
%endif
|
||||||
|
|
||||||
%package -n python3-gpg
|
%package -n python3-gpg
|
||||||
Summary: %{name} bindings for Python 3
|
Summary: %{name} bindings for Python 3
|
||||||
@ -165,7 +176,6 @@ sed -i -e 's|^libdir=@libdir@$|libdir=@exec_prefix@/lib|g' src/gpgme-config.in
|
|||||||
# unpackaged files
|
# unpackaged files
|
||||||
rm -fv %{buildroot}%{_infodir}/dir
|
rm -fv %{buildroot}%{_infodir}/dir
|
||||||
rm -fv %{buildroot}%{_libdir}/lib*.la
|
rm -fv %{buildroot}%{_libdir}/lib*.la
|
||||||
rm -fv %{buildroot}%{_libdir}/pkgconfig/%{name}*.pc
|
|
||||||
|
|
||||||
# Hack to resolve multiarch conflict (#341351)
|
# Hack to resolve multiarch conflict (#341351)
|
||||||
%ifarch %{multilib_arches}
|
%ifarch %{multilib_arches}
|
||||||
@ -186,7 +196,7 @@ chrpath -d %{buildroot}%{_libdir}/libq%{name}.so*
|
|||||||
# autofoo installs useless stuff for uninstall
|
# autofoo installs useless stuff for uninstall
|
||||||
%if %{with python2}
|
%if %{with python2}
|
||||||
rm -vf %{buildroot}%{python2_sitelib}/gpg/install_files.txt
|
rm -vf %{buildroot}%{python2_sitelib}/gpg/install_files.txt
|
||||||
%endif # with python2
|
%endif
|
||||||
rm -vf %{buildroot}%{python3_sitelib}/gpg/install_files.txt
|
rm -vf %{buildroot}%{python3_sitelib}/gpg/install_files.txt
|
||||||
|
|
||||||
%if %{with check}
|
%if %{with check}
|
||||||
@ -197,7 +207,7 @@ make check
|
|||||||
%ldconfig_scriptlets
|
%ldconfig_scriptlets
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license COPYING*
|
%license COPYING* LICENSES
|
||||||
%doc AUTHORS ChangeLog NEWS README* THANKS TODO VERSION
|
%doc AUTHORS ChangeLog NEWS README* THANKS TODO VERSION
|
||||||
%{_libdir}/lib%{name}.so.11*
|
%{_libdir}/lib%{name}.so.11*
|
||||||
%{_bindir}/%{name}-json
|
%{_bindir}/%{name}-json
|
||||||
@ -221,6 +231,7 @@ fi
|
|||||||
%{_libdir}/lib%{name}.so
|
%{_libdir}/lib%{name}.so
|
||||||
%{_datadir}/aclocal/%{name}.m4
|
%{_datadir}/aclocal/%{name}.m4
|
||||||
%{_infodir}/%{name}.info*
|
%{_infodir}/%{name}.info*
|
||||||
|
%{_libdir}/pkgconfig/%{name}*.pc
|
||||||
|
|
||||||
%files -n %{name}pp
|
%files -n %{name}pp
|
||||||
%doc lang/cpp/README
|
%doc lang/cpp/README
|
||||||
@ -246,7 +257,7 @@ fi
|
|||||||
%doc lang/python/README
|
%doc lang/python/README
|
||||||
%{python2_sitearch}/gpg-*.egg-info
|
%{python2_sitearch}/gpg-*.egg-info
|
||||||
%{python2_sitearch}/gpg/
|
%{python2_sitearch}/gpg/
|
||||||
%endif # with python2
|
%endif
|
||||||
|
|
||||||
%files -n python3-gpg
|
%files -n python3-gpg
|
||||||
%doc lang/python/README
|
%doc lang/python/README
|
||||||
@ -254,6 +265,27 @@ fi
|
|||||||
%{python3_sitearch}/gpg/
|
%{python3_sitearch}/gpg/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 16 2024 Michal Hlavinka <mhlavink@redhat.com> - 1.13.1-12
|
||||||
|
- add libassuan-devel to devel pkg requirements (#RHEL-6920)
|
||||||
|
|
||||||
|
* Thu Feb 10 2022 Jiri Kucera <jkucera@redhat.com> - 1.13.1-11
|
||||||
|
- Update pkgconfig files
|
||||||
|
Related: #1953905
|
||||||
|
|
||||||
|
* Wed Feb 09 2022 Jiri Kucera <jkucera@redhat.com> - 1.13.1-10
|
||||||
|
- Add fixed pkgconfig files
|
||||||
|
Resolves: #1953905
|
||||||
|
|
||||||
|
* Fri Jun 11 2021 Jiri Kucera <jkucera@redhat.com> - 1.13.1-9
|
||||||
|
- Remove pkgconfig files
|
||||||
|
Needs libgpg-error and libassuan rebase
|
||||||
|
Related: #1882423
|
||||||
|
|
||||||
|
* Tue Jun 08 2021 Jiri Kucera <jkucera@redhat.com> - 1.13.1-8
|
||||||
|
- Add LICENSES file into the tarball, update License field
|
||||||
|
Add pkgconfig files to gpgme-devel
|
||||||
|
Resolves: #1882423, #1953905
|
||||||
|
|
||||||
* Wed Nov 18 2020 Jiri Kucera <jkucera@redhat.com> - 1.13.1-7
|
* Wed Nov 18 2020 Jiri Kucera <jkucera@redhat.com> - 1.13.1-7
|
||||||
- Fix null dereference
|
- Fix null dereference
|
||||||
Fix licence tag
|
Fix licence tag
|
||||||
|
Loading…
Reference in New Issue
Block a user