5.21.0-4

- fix URL
- -devel: depend (only) on -libs
- -libs: move plugins here
- Provides: kf5-baloo-tools

kf5-baloo.spec

@@ -10,12 +10,12 @@
 Name:           kf5-%{framework}
 Summary:        A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality
 Version:        5.21.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 # libs are LGPL, tools are GPL
 # KDE e.V. may determine that future LGPL/GPL versions are accepted
 License:        (LGPLv2 or LGPLv3) and (GPLv2 or GPLv3)
-URL:            https://quickgit.kde.org/?p=%{name}.git
+URL:            https://quickgit.kde.org/?p=%{framework}.git
 
 %global versiondir %(echo %{version} | cut -d. -f1-2)
 %global revision %(echo %{version} | cut -d. -f3)
@@ -47,10 +47,10 @@ BuildRequires:  lmdb-devel
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qt5-qtdeclarative-devel
 
-
 Requires:       kf5-filesystem >= %{version}
 
 Obsoletes:      kf5-baloo-tools < 5.5.95-1
+Provides:       kf5-baloo-tools = %{version}-%{release}
 %if 0%{?fedora}
 Obsoletes:      baloo < 5
 Provides:       baloo = %{version}-%{release}
@@ -58,6 +58,9 @@ Provides:       baloo = %{version}-%{release}
 Conflicts:      baloo < 5
 %endif
 
+# main pkg accidentally multilib'd prior to 5.21.0-4
+Obsoletes:      kf5-baloo < 5.21.0-4
+
 %description
 %{summary}.
 
@@ -65,8 +68,7 @@ Conflicts:      baloo < 5
 Summary:        Development files for %{name}
 # KDE e.V. may determine that future LGPL versions are accepted
 License:        LGPLv2 or LGPLv3
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-Requires:       %{name}-file%{?_isa} = %{version}-%{release}
 Requires:       kf5-kcoreaddons-devel >= %{version}
 Requires:       kf5-kfilemetadata-devel >= %{version}
 Requires:       qt5-qtbase-devel
@@ -139,23 +141,37 @@ time make test -C %{_target_platform} ARGS="--timeout 300 --output-on-failure" |
 %endif
 
 
-%post
+%files -f %{name}.lang
+%license COPYING
+%{_kf5_bindir}/baloosearch
+%{_kf5_bindir}/balooshow
+%{_kf5_bindir}/balooctl
+
+%files file -f %{name}-file.lang
+%{_prefix}/lib/sysctl.d/97-kde-baloo-filewatch-inotify.conf
+%{_kf5_bindir}/baloo_file
+%{_kf5_bindir}/baloo_file_extractor
+%{_kf5_sysconfdir}/xdg/autostart/baloo_file.desktop
+
+%post libs
+/sbin/ldconfig
 touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null || :
 
-%posttrans
+%posttrans libs
 gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
+/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
 touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
 fi
 
-%files -f %{name}.lang
+%files libs
-%license COPYING
+%license COPYING.LIB
-%{_kf5_bindir}/baloosearch
+%{_kf5_libdir}/libKF5Baloo.so.*
-%{_kf5_bindir}/balooshow
+%{_kf5_libdir}/libKF5BalooEngine.so.*
-%{_kf5_bindir}/balooctl
+# multilib'd plugins and friends
 %{_kf5_plugindir}/kio/baloosearch.so
 %{_kf5_plugindir}/kio/tags.so
 %{_kf5_plugindir}/kio/timeline.so
@@ -164,21 +180,8 @@ fi
 %{_kf5_datadir}/kservices5/baloosearch.protocol
 %{_kf5_datadir}/kservices5/tags.protocol
 %{_kf5_datadir}/kservices5/timeline.protocol
-%{_kf5_datadir}/icons/hicolor/*/apps/baloo.png
+# track icon size too, since it may conflict with baloo-4.x
-
+%{_kf5_datadir}/icons/hicolor/128x128/apps/baloo.png
-%files file -f %{name}-file.lang
-%{_prefix}/lib/sysctl.d/97-kde-baloo-filewatch-inotify.conf
-%{_kf5_bindir}/baloo_file
-%{_kf5_bindir}/baloo_file_extractor
-%{_kf5_sysconfdir}/xdg/autostart/baloo_file.desktop
-
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
-%files libs
-%license COPYING.LIB
-%{_kf5_libdir}/libKF5Baloo.so.*
-%{_kf5_libdir}/libKF5BalooEngine.so.*
 
 %files devel
 %{_kf5_libdir}/libKF5Baloo.so
@@ -190,11 +193,17 @@ fi
 
 
 %changelog
+* Fri Apr 29 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.21.0-4
+- fix URL
+- -devel: depend (only) on -libs
+- -libs: move plugins here
+- Provides: kf5-baloo-tools
+
 * Wed Apr 27 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.21.0-3
 - support bootstrap, %%check: enable tests (advisory)
 
 * Wed Apr 27 2016 Orion Poplawski <orion@cora.nwra.com> - 5.21.0-2
-- Do not obsolete/provide baloo{-file} in EPEL, use Conflicts (for now)
+- Do not obsolete/provide baloo{-file} in EPEL, use Conflicts (#1329899)
 - update URL
 
 * Mon Apr 04 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.21.0-1