diff --git a/gpgme.changes b/gpgme.changes index 4ab6b82..5549220 100644 --- a/gpgme.changes +++ b/gpgme.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 7 12:01:11 UTC 2017 - mpluskal@suse.com + +- Make python package naming consistent with python singlespec + ------------------------------------------------------------------- Tue Mar 28 18:01:47 UTC 2017 - astieger@suse.com diff --git a/gpgme.spec b/gpgme.spec index 3994a80..c25fca0 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -25,7 +25,7 @@ Name: gpgme Version: 1.9.0 Release: 0 Summary: Programmatic library interface to GnuPG -License: LGPL-2.1+ and GPL-3.0+ +License: LGPL-2.1+ AND GPL-3.0+ Group: Productivity/Security Url: http://www.gnupg.org/related_software/gpgme/ Source: ftp://ftp.gnupg.org/gcrypt/gpgme/%{name}-%{version}.tar.bz2 @@ -42,9 +42,8 @@ BuildRequires: pkgconfig BuildRequires: swig Requires(post): %{install_info_prereq} Requires(preun): %{install_info_prereq} -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?with_python} -BuildRequires: python-devel >= 2.7 +BuildRequires: python2-devel >= 2.7 BuildRequires: python3-devel >= 3.4 %endif %if 0%{with_qt} @@ -75,9 +74,9 @@ Group: Development/Libraries/C and C++ Requires: glibc-devel Requires: libgpg-error-devel Requires: libgpgme11 = %{version} +%requires_ge libassuan-devel Provides: gpgme-devel = %{version} Obsoletes: gpgme-devel < %{version} -%requires_ge libassuan-devel %description -n libgpgme-devel GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG @@ -108,7 +107,7 @@ Requires: glibc-devel Requires: libgpg-error-devel Requires: libgpgme-devel = %{version} Requires: libgpgmepp6 = %{version} -%requires_ge libassuan-devel +%requires_ge libassuan-devel %description -n libgpgmepp-devel GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG @@ -120,11 +119,13 @@ This subpackage contains the headers needed for building applications making use of libgpgmepp. %if 0%{?with_python} -%package -n python-gpg +%package -n python2-gpg Summary: Python 2 bindings for GPGME, a library for accessing GnuPG Group: Development/Languages/Python +Provides: python-gpg = %{version}-%{release} +Obsoletes: python-gpg < %{version}-%{release} -%description -n python-gpg +%description -n python2-gpg GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications. It provides a high-level crypto API for encryption, decryption, signing, signature verification, and key @@ -232,7 +233,6 @@ make %{?_smp_mflags} check %install_info_delete --info-dir=%{_infodir} %{_infodir}/gpgme.info%{ext_info} %files -%defattr(-,root,root) %doc AUTHORS COPYING COPYING.LESSER ChangeLog ChangeLog-2011 README NEWS THANKS TODO VERSION %{_bindir}/gpgme-tool %{_datadir}/common-lisp @@ -240,22 +240,18 @@ make %{?_smp_mflags} check %{_infodir}/gpgme* %files -n libgpgme11 -%defattr(-,root,root) %{_libdir}/libgpgme.so.* %files -n libgpgme-devel -%defattr(-,root,root) %{_libdir}/libgpgme.so %{_bindir}/gpgme-config %{_datadir}/aclocal/gpgme.m4 %{_includedir}/gpgme.h %files -n libgpgmepp6 -%defattr(-,root,root) %{_libdir}/libgpgmepp.so.* %files -n libgpgmepp-devel -%defattr(-,root,root) %{_libdir}/libgpgmepp.so %{_includedir}/gpgme++ %dir %{_libdir}/cmake @@ -263,22 +259,18 @@ make %{?_smp_mflags} check %{_libdir}/cmake/Gpgmepp/GpgmeppConfig*.cmake %if 0%{?with_python} -%files -n python-gpg -%defattr(-,root,root) +%files -n python2-gpg %{python_sitearch}/gpg %files -n python3-gpg -%defattr(-,root,root) %{python3_sitearch}/gpg %endif %if 0%{with_qt} %files -n libqgpgme7 -%defattr(-,root,root) %{_libdir}/libqgpgme.so.* %files -n libqgpgme-devel -%defattr(-,root,root) %{_includedir}/qgpgme/ %{_includedir}/QGpgME/ %dir %{_libdir}/cmake