5.18.0-2

- update URL
- drop build_main_package hacks
- -libs: move more plugins here, Requires: %{name} ...

kf5-kactivities.spec

@@ -1,16 +1,12 @@
 %global framework kactivities
 
-%if 0%{?fedora} > 21 || "%{?copr_projectname}" == "plasma-5"
-%global build_main_package 1
-%endif
-
 Name:           kf5-%{framework}
 Summary:        A KDE Frameworks 5 Tier 3 to organize user work into separate activities
 Version:        5.18.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 License:        GPLv2+ and LGPLv2+
-URL:            http://www.kde.org
+URL:            https://projects.kde.org/kactivities
 
 %global versiondir %(echo %{version} | cut -d. -f1-2)
 %global revision %(echo %{version} | cut -d. -f3)
@@ -22,27 +18,24 @@ URL:            http://www.kde.org
 Source0:        http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz
 
 BuildRequires:  boost-devel
-
-BuildRequires:  kf5-rpm-macros >= %{version}
 BuildRequires:  extra-cmake-modules >= %{version}
-BuildRequires:  qt5-qtbase-devel
+BuildRequires:  kf5-kcmutils-devel >= %{version}
-BuildRequires:  qt5-qtdeclarative-devel
-BuildRequires:  kf5-kxmlgui-devel >= %{version}
-BuildRequires:  kf5-kglobalaccel-devel >= %{version}
-BuildRequires:  kf5-kwidgetsaddons-devel >= %{version}
-
-
-BuildRequires:  kf5-kdbusaddons-devel >= %{version}
-BuildRequires:  kf5-ki18n-devel >= %{version}
 BuildRequires:  kf5-kconfig-devel >= %{version}
 BuildRequires:  kf5-kcoreaddons-devel >= %{version}
+BuildRequires:  kf5-kdbusaddons-devel >= %{version}
+BuildRequires:  kf5-kdeclarative-devel >= %{version}
+BuildRequires:  kf5-kglobalaccel-devel >= %{version}
+BuildRequires:  kf5-ki18n-devel >= %{version}
 BuildRequires:  kf5-kio-devel >= %{version}
 BuildRequires:  kf5-kservice-devel >= %{version}
+BuildRequires:  kf5-kwidgetsaddons-devel >= %{version}
 BuildRequires:  kf5-kwindowsystem-devel >= %{version}
-BuildRequires:  kf5-kdeclarative-devel >= %{version}
+BuildRequires:  kf5-kxmlgui-devel >= %{version}
-BuildRequires:  kf5-kcmutils-devel >= %{version}
+BuildRequires:  kf5-rpm-macros >= %{version}
+BuildRequires:  qt5-qtbase-devel
+BuildRequires:  qt5-qtdeclarative-devel
 
-Requires:       kf5-kactivities-libs%{?_isa} = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 Obsoletes:      kactivities < 4.90.0
 Provides:       kactivities%{?_isa} = %{version}-%{release}
@@ -55,6 +48,7 @@ consumer, application adding information to them or as an activity manager.
 %package libs
 Summary:        Libraries for KActivities framework
 Requires:       kf5-filesystem
+Requires:       %{name} = %{version}-%{release}
 %description    libs
 %{summary}.
 
@@ -69,51 +63,41 @@ Requires:       qt5-qtbase-devel
 %prep
 %setup -q -n %{framework}-%{version}
 
+
 %build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%find_lang kactivities5_qt --with-qt --all-name
 
-%if !0%{?build_main_package}
+%find_lang kactivities5_qt --with-qt --all-name
-rm -f %{buildroot}%{_kf5_bindir}/kactivitymanagerd
-rm -f %{buildroot}%{_kf5_datadir}/kservices5/*.desktop
-rm -f %{buildroot}%{_kf5_datadir}/kservices5/*.protocol
-rm -f %{buildroot}%{_kf5_datadir}/kservicetypes5/kactivitymanagerd-plugin.desktop
-rm -rf %{buildroot}%{_kf5_qtplugindir}/kactivitymanagerd/
-rm -r %{buildroot}%{_kf5_qtplugindir}/*.so
-rm -rf %{buildroot}/%{_kf5_datadir}/kf5/kactivitymanagerd
-%endif
 
 
-%if 0%{?build_main_package}
 %files
-%doc README README.md README.packagers README.developers MAINTAINER
+%doc README.md
+%license COPYING*
 %{_kf5_bindir}/kactivitymanagerd
 %{_kf5_datadir}/kservices5/*.desktop
 %{_kf5_datadir}/kservices5/activities.protocol
 %{_kf5_datadir}/kservicetypes5/kactivitymanagerd-plugin.desktop
-%{_kf5_qtplugindir}/kactivitymanagerd/
-%{_kf5_qtplugindir}/*.so
 %{_kf5_datadir}/kf5/kactivitymanagerd/
-%endif
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
 %files libs -f kactivities5_qt.lang
-%if !0%{?build_main_package}
-%doc README README.md README.packagers README.developers MAINTAINER
-%endif
 %{_kf5_libdir}/libKF5Activities.so.*
+# plugins, misc multilib bits
 %{_kf5_libdir}/libkactivitymanagerd_plugin.so
 %{_kf5_qmldir}/org/kde/activities/
+%{_kf5_qtplugindir}/kactivitymanagerd/
+%{_kf5_qtplugindir}/*.so
 
 %files devel
 %{_kf5_libdir}/libKF5Activities.so
@@ -125,6 +109,11 @@ rm -rf %{buildroot}/%{_kf5_datadir}/kf5/kactivitymanagerd
 
 
 %changelog
+* Thu Jan 14 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.18.0-2
+- update URL
+- drop build_main_package hacks
+- -libs: move more plugins here, Requires: %%{name} ...
+
 * Sun Jan 03 2016 Daniel Vrátil <dvratil@fedoraproject.org> - 5.18.0-1
 - KDE Frameworks 5.18.0