rdieter pushed to baloo (master). "4.14.3-4 (..more)"

[notifications at fedoraproject.org]

From 7fcebfc7460ee6c2fab8d2d8d20524d09de32ab7 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 23 May 2015 19:15:08 -0500
Subject: 4.14.3-4

- update URL
- omit main (baloo) pkg on f22+ (where it is replaced by kf5-baloo)

diff --git a/baloo.spec b/baloo.spec
index c408162..677d0a8 100644
--- a/baloo.spec
+++ b/baloo.spec
@@ -1,11 +1,18 @@
 
+%if ! 0%{?bootstrap}
+%if 0%{?fedora} > 21
+%define plasma5 1
+%endif
+%endif
+
 Name:    baloo
 Summary: A framework for searching and managing metadata
 Version: 4.14.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2 and LGPLv2
-URL:     https://projects.kde.org/projects/kde/kdelibs/baloo
+URL:     https://projects.kde.org/projects/kde/workspace/baloo
+#URL:    https://community.kde.org/Baloo
 
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
@@ -76,11 +83,11 @@ Obsoletes: %{name} < 4.14.0-3
 %{summary}.
 
 %prep
-%autosetup -p1
+%setup -q
 
 
 %build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
@@ -91,14 +98,29 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+%if 0%{?plasma5}
+## unpackaged files
+rm -fv %{buildroot}%{_sysconfdir}/dbus-1/system.d/org.kde.baloo.filewatch.conf
+rm -fv %{buildroot}%{_datadir}/dbus-1/system-services/org.kde.baloo.filewatch.service
+rm -fv %{buildroot}%{_datadir}/dbus-1/interfaces/org.kde.baloo.file.indexer.xml
+rm -fv %{buildroot}%{_kde4_bindir}/baloo*
+rm -fv %{buildroot}%{_kde4_iconsdir}/hicolor/*/apps/baloo.*
+rm -fv %{buildroot}%{_kde4_datadir}/autostart/baloo_file.desktop
+rm -fv %{buildroot}%{_kde4_libdir}/kde4/{baloo_filesearchstore,kcm_baloofile}.so
+rm -fv %{buildroot}%{_kde4_libexecdir}/kde_baloo_filewatch_raiselimit
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/{baloo_filesearchstore,kcm_baloofile}.desktop
+rm -fv %{buildroot}%{_polkit_qt_policydir}/org.kde.baloo.filewatch.policy
+%else
 %if 0%{?sysctl}
 install -p -m644 -D %{SOURCE1} %{buildroot}%{_prefix}/lib/sysctl.d/97-kde-baloo-filewatch-inotify.conf
 install -p -m644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/sysctl.d/97-kde-baloo-filewatch-inotify.conf
 %else
 install -p -m644    %{SOURCE1} ./97-kde-baloo-filewatch-inotify.conf
 %endif
+%endif
 
 
+%if ! 0%{?plasma5}
 %post
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
@@ -116,7 +138,7 @@ fi
 %{_kde4_bindir}/balooctl
 %{_kde4_bindir}/baloosearch
 %{_kde4_bindir}/balooshow
-%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/hicolor/*/apps/baloo.*
 
 %post file
 if [ -f "%{_sysconfdir}/sysctl.d/97-kde-nepomuk-filewatch-inotify.conf" ]; then
@@ -144,7 +166,7 @@ fi
 %{_kde4_datadir}/kde4/services/baloo_filesearchstore.desktop
 %{_kde4_datadir}/kde4/services/kcm_baloofile.desktop
 %{_kde4_libdir}/kde4/kcm_baloofile.so
-
+%endif
 
 %files akonadi
 %{_kde4_bindir}/akonadi_baloo_indexer
@@ -152,7 +174,6 @@ fi
 %{_kde4_libdir}/kde4/akonadi/akonadi_baloo_searchplugin.so
 %{_kde4_libdir}/kde4/akonadi/akonadibaloosearchplugin.desktop
 
-
 %files devel
 %{_kde4_includedir}/baloo/
 %{_kde4_libdir}/libbaloocore.so
@@ -191,6 +212,10 @@ fi
 
 
 %changelog
+* Sat May 23 2015 Rex Dieter <rdieter at fedoraproject.org> - 4.14.3-4
+- update URL
+- omit main (baloo) pkg on f22+ (where it is replaced by kf5-baloo)
+
 * Thu Apr 16 2015 Rex Dieter <rdieter at fedoraproject.org> 4.14.3-3
 - rebuild (gcc5)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/baloo.git/commit/?h=master&id=7fcebfc7460ee6c2fab8d2d8d20524d09de32ab7