From 4397087851836b3fac5aa4a73b3ee4fdb3201930 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 30 Oct 2015 06:57:20 -0500 Subject: [PATCH] name qt5 subpkgs properly (libaccounts-qt-qt5 => libaccounts-qt5) --- libaccounts-qt.spec | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/libaccounts-qt.spec b/libaccounts-qt.spec index d5100dd..437c8e2 100644 --- a/libaccounts-qt.spec +++ b/libaccounts-qt.spec @@ -4,7 +4,7 @@ Name: libaccounts-qt Summary: Accounts framework Qt bindings Version: 1.13 -Release: 10%{?dist} +Release: 11%{?dist} License: LGPLv2 URL: https://gitlab.com/accounts-sso/libaccounts-qt @@ -31,16 +31,18 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel %{summary}. -%package qt5 +%package -n libaccounts-qt5 Summary: Accounts framework Qt5 bindings BuildRequires: pkgconfig(Qt5Gui) -%description qt5 +Obsoletes: libaccounts-qt-qt5 < 1.13-11 +%description -n libaccounts-qt5 %{summary}. -%package qt5-devel +%package -n libaccounts-qt5-devel Summary: Development files for %{name} -Requires: %{name}-qt5%{?_isa} = %{version}-%{release} -%description qt5-devel +Obsoletes: libaccounts-qt-qt5-devel < 1.13-11 +Requires: libaccounts-qt5%{?_isa} = %{version}-%{release} +%description -n libaccounts-qt5-devel %{summary}. %package doc @@ -123,10 +125,10 @@ rm -fv %{buildroot}%{_bindir}/accountstest %{_libdir}/pkgconfig/accounts-qt.pc %{_libdir}/cmake/AccountsQt/ -%post qt5 -p /sbin/ldconfig -%postun qt5 -p /sbin/ldconfig +%post -n libaccounts-qt5 -p /sbin/ldconfig +%postun -n libaccounts-qt5 -p /sbin/ldconfig -%files qt5 +%files -n libaccounts-qt5 %license COPYING %{_libdir}/libaccounts-qt5.so.* %dir %{_datadir}/accounts/ @@ -134,7 +136,7 @@ rm -fv %{buildroot}%{_bindir}/accountstest %dir %{_datadir}/accounts/services/ -%files qt5-devel +%files -n libaccounts-qt5-devel %{_libdir}/libaccounts-qt5.so %{_includedir}/accounts-qt5/ %{_libdir}/pkgconfig/accounts-qt5.pc @@ -145,6 +147,9 @@ rm -fv %{buildroot}%{_bindir}/accountstest %changelog +* Fri Oct 30 2015 Rex Dieter 1.13-11 +- name qt5 subpkgs properly (libaccounts-qt-qt5 => libaccounts-qt5) + * Thu Oct 29 2015 Rex Dieter - 1.13-10 - hack around cannot build out of src-tree - provide -qt5, -doc here