diff --git a/97-kde-baloo-filewatch-inotify.conf b/97-kde-baloo-filewatch-inotify.conf new file mode 100644 index 0000000..10929ff --- /dev/null +++ b/97-kde-baloo-filewatch-inotify.conf @@ -0,0 +1 @@ +fs.inotify.max_user_watches = 524288 diff --git a/baloo.spec b/baloo.spec index 37f1d40..36962d6 100644 --- a/baloo.spec +++ b/baloo.spec @@ -2,7 +2,7 @@ Name: baloo Summary: A framework for searching and managing metadata Version: 4.13.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and LGPLv2 URL: https://projects.kde.org/projects/kde/kdelibs/baloo @@ -15,6 +15,11 @@ URL: https://projects.kde.org/projects/kde/kdelibs/baloo %endif Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz +%if 0%{?fedora} > 17 || 0%{?rhel} > 6 +%define sysctl 1 +%endif +Source1: 97-kde-baloo-filewatch-inotify.conf + ## upstream patches BuildRequires: doxygen @@ -36,6 +41,17 @@ Requires: kdelibs4%{?_isa}%{?_kde4_version: >= %{_kde4_version}} %description %{summary}. +%package file +Summary: File indexing and search for %{name} +# upgrade path, when split occurred +Obsoletes: baloo < 4.13.0-3 +Requires: %{name} = %{version}-%{release} +# for kcm. since this is split out, we can afford to add this dep +# and not worry about circular dependencies +Requires: kde-runtime +%description file +%{summary}. + %package devel Summary: Developer files for %{name} Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -67,6 +83,13 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%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 + %post touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || : @@ -82,42 +105,50 @@ fi %files %doc COPYING COPYING.LIB -%{_sysconfdir}/dbus-1/system.d/org.kde.baloo.filewatch.conf %{_kde4_bindir}/akonadi_baloo_indexer -%{_kde4_bindir}/baloo_file -%{_kde4_bindir}/baloo_file_cleaner -%{_kde4_bindir}/baloo_file_extractor %{_kde4_bindir}/baloosearch %{_kde4_bindir}/balooshow -%{_kde4_libexecdir}/kde_baloo_filewatch_raiselimit %{_kde4_datadir}/akonadi/agents/akonadibalooindexingagent.desktop -%{_kde4_datadir}/autostart/baloo_file.desktop -%{_datadir}/dbus-1/interfaces/org.kde.baloo.file.indexer.xml -%{_datadir}/dbus-1/system-services/org.kde.baloo.filewatch.service %{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_datadir}/kde4/services/baloo_contactsearchstore.desktop %{_kde4_datadir}/kde4/services/baloo_emailsearchstore.desktop -%{_kde4_datadir}/kde4/services/baloo_filesearchstore.desktop %{_kde4_datadir}/kde4/services/baloo_notesearchstore.desktop %{_kde4_datadir}/kde4/services/baloosearch.protocol -%{_kde4_datadir}/kde4/services/kcm_baloofile.desktop %{_kde4_datadir}/kde4/services/plasma-runner-baloosearch.desktop %{_kde4_datadir}/kde4/services/tags.protocol %{_kde4_datadir}/kde4/services/timeline.protocol %{_kde4_datadir}/kde4/servicetypes/baloosearchstore.desktop -%{_polkit_qt_policydir}/org.kde.baloo.filewatch.policy %{_kde4_libdir}/kde4/akonadi/akonadi_baloo_searchplugin.so %{_kde4_libdir}/kde4/akonadi/akonadibaloosearchplugin.desktop %{_kde4_libdir}/kde4/baloo_contactsearchstore.so %{_kde4_libdir}/kde4/baloo_emailsearchstore.so -%{_kde4_libdir}/kde4/baloo_filesearchstore.so %{_kde4_libdir}/kde4/baloo_notesearchstore.so -%{_kde4_libdir}/kde4/kcm_baloofile.so %{_kde4_libdir}/kde4/kio_baloosearch.so %{_kde4_libdir}/kde4/kio_tags.so %{_kde4_libdir}/kde4/kio_timeline.so %{_kde4_libdir}/kde4/krunner_baloosearchrunner.so +%files file +%if 0%{?sysctl} +%ghost %config(missingok,noreplace) %{_sysconfdir}/sysctl.d/97-kde-baloo-filewatch-inotify.conf +%{_prefix}/lib/sysctl.d/97-kde-baloo-filewatch-inotify.conf +%else +%doc 97-kde-baloo-filewatch-inotify.conf +%endif +%{_kde4_datadir}/autostart/baloo_file.desktop +%{_kde4_bindir}/baloo_file +%{_kde4_bindir}/baloo_file_cleaner +%{_kde4_bindir}/baloo_file_extractor +%{_datadir}/dbus-1/interfaces/org.kde.baloo.file.indexer.xml +%{_kde4_libexecdir}/kde_baloo_filewatch_raiselimit +%{_sysconfdir}/dbus-1/system.d/org.kde.baloo.filewatch.conf +%{_datadir}/dbus-1/system-services/org.kde.baloo.filewatch.service +%{_polkit_qt_policydir}/org.kde.baloo.filewatch.policy +%{_kde4_libdir}/kde4/baloo_filesearchstore.so +%{_kde4_datadir}/kde4/services/baloo_filesearchstore.desktop +%{_kde4_datadir}/kde4/services/kcm_baloofile.desktop +%{_kde4_libdir}/kde4/kcm_baloofile.so + %files devel %{_kde4_includedir}/baloo/ %{_kde4_libdir}/libbaloocore.so @@ -136,8 +167,10 @@ fi %{_kde4_libdir}/libbalooxapian.so.4* - %changelog +* Wed Apr 23 2014 Rex Dieter 4.13.0-3 +- -file subpkg, port sysctl handling from nepomuk-core + * Tue Apr 15 2014 Rex Dieter 4.13.0-2 - respin