[nepomuk-core] proposed patch to fix/workaround isEmpty crash (#858271)

Rex Dieter rdieter at fedoraproject.org
Tue Oct 2 23:13:58 UTC 2012


commit 8f061dad22d870c5df6a67c8c88b3cfc4d5ecaf0
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Oct 2 18:14:00 2012 -0500

    proposed patch to fix/workaround isEmpty crash (#858271)

 nepomuk-core.spec    |   21 ++++++++++++++++++---
 nepomuk-inotify.conf |    3 +++
 2 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/nepomuk-core.spec b/nepomuk-core.spec
index 19511f2..ab853ee 100644
--- a/nepomuk-core.spec
+++ b/nepomuk-core.spec
@@ -9,7 +9,7 @@
 
 Name:    nepomuk-core
 Version: 4.9.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Nepomuk Core utilities and libraries
 
 License: LGPLv2 or LGPLv3
@@ -23,6 +23,11 @@ URL:     http://www.kde.org/
 %endif
 Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
 
+%if 0%{?fedora} > 17
+%define sysctl 1
+%endif
+Source1: nepomuk-inotify.conf
+
 ## upstream patches
 # proposed by dfaure, should help fix http://bugzilla.redhat.com/858271
 Patch100: nepomuk-core-4.9.2-isEmpty_crash.patch
@@ -84,17 +89,27 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+%if 0%{?sysctl}
+install -p -m644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/sysctl.d/nepomuk-inotify.conf
+%else
+install -p -m644    %{SOURCE1} ./nepomuk-inotify.conf
+%endif
+
 
 %check
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/nepomukbackup.desktop
 %if 0%{?tests}
-# takes a little while and some known to fail currently (failures *should* get fixed in 4.9.1) -- rex
 make -C %{_target_platform}/autotests/test test  ||:
 %endif
 
 
 %files
-%doc ontologies/README
+%doc ontologies/README COPYING.LGPL*
+%if 0%{?sysctl}
+%config(noreplace) %{_sysconfdir}/sysctl.d/nepomuk-inotify.conf
+%else
+%doc nepomuk-inotify.conf 
+%endif
 %{_kde4_appsdir}/fileindexerservice/
 %{_kde4_appsdir}/nepomukfilewatch/
 %{_kde4_appsdir}/nepomukstorage/
diff --git a/nepomuk-inotify.conf b/nepomuk-inotify.conf
new file mode 100644
index 0000000..e243492
--- /dev/null
+++ b/nepomuk-inotify.conf
@@ -0,0 +1,3 @@
+# install into /etc/sysctl.d/ 
+# allows nepomuk to have a fighting chance to use inotify
+fs.inotify.max_user_watches=524288


More information about the scm-commits mailing list