rename gpgme-pp to gpgmepp, simplify -devel deps

This commit is contained in:
Rex Dieter 2017-01-01 08:05:31 -06:00
parent 5c52124875
commit 3e8503eae1

View File

@ -11,7 +11,7 @@
Name: gpgme Name: gpgme
Summary: GnuPG Made Easy - high level crypto API Summary: GnuPG Made Easy - high level crypto API
Version: 1.8.0 Version: 1.8.0
Release: 6%{?dist} Release: 7%{?dist}
License: LGPLv2+ License: LGPLv2+
URL: https://gnupg.org/related_software/gpgme/ URL: https://gnupg.org/related_software/gpgme/
@ -65,26 +65,32 @@ Requires(postun): /sbin/install-info
%description devel %description devel
%{summary}. %{summary}.
%package pp %package -n %{name}pp
Summary: C++ bindings/wrapper for GPGME 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} Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%description pp %description -n %{name}pp
%{summary}. %{summary}.
%package pp-devel %package -n %{name}pp-devel
Summary: Development libraries and header files for %{name}-pp Summary: Development libraries and header files for %{name}-pp
Requires: %{name}-pp%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: gpgme-pp-devel < 1.8.0-7
Requires: %{name}-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} 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 # For automatic provides
BuildRequires: cmake BuildRequires: cmake
%description pp-devel %description -n %{name}pp-devel
%{summary} %{summary}
%package -n q%{name} %package -n q%{name}
Summary: Qt API bindings/wrapper for GPGME Summary: Qt API bindings/wrapper for GPGME
Requires: %{name}-pp%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}pp%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5Test)
@ -94,7 +100,7 @@ BuildRequires: pkgconfig(Qt5Test)
%package -n q%{name}-devel %package -n q%{name}-devel
Summary: Development libraries and header files for %{name} Summary: Development libraries and header files for %{name}
Requires: q%{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: q%{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{name}-pp-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}pp-devel%{?_isa}
# For automatic provides # For automatic provides
BuildRequires: cmake BuildRequires: cmake
@ -193,11 +199,11 @@ fi
%{_datadir}/aclocal/%{name}.m4 %{_datadir}/aclocal/%{name}.m4
%{_infodir}/%{name}.info* %{_infodir}/%{name}.info*
%files pp %files -n %{name}pp
%doc lang/cpp/README %doc lang/cpp/README
%{_libdir}/lib%{name}pp.so.* %{_libdir}/lib%{name}pp.so.*
%files pp-devel %files -n %{name}pp-devel
%{_includedir}/%{name}++/ %{_includedir}/%{name}++/
%{_libdir}/lib%{name}pp.so %{_libdir}/lib%{name}pp.so
%dir %{_libdir}/cmake/ %dir %{_libdir}/cmake/
@ -225,6 +231,9 @@ fi
%{python3_sitearch}/gpg/ %{python3_sitearch}/gpg/
%changelog %changelog
* Sun Jan 01 2017 Rex Dieter <rdieter@math.unl.edu> - 1.8.0-7
- rename gpgme-pp to gpgmepp, simplify -devel deps
* Sun Jan 01 2017 Rex Dieter <rdieter@math.unl.edu> - 1.8.0-6 * Sun Jan 01 2017 Rex Dieter <rdieter@math.unl.edu> - 1.8.0-6
- backport upstream cmake-related fix - backport upstream cmake-related fix