[nepomuk-core] respin isEmpty_crash based on 32b44881 upstream commit (#858271)

[Rex Dieter]

commit 5b44a68a1aab9688fbcb81c9e335f3fd56d61595
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Oct 3 17:15:31 2012 -0500

    respin isEmpty_crash based on 32b44881 upstream commit (#858271)

 nepomuk-core-4.9.2-isEmpty_crash.patch |   22 +++++++++++++++-------
 nepomuk-core.spec                      |    5 ++++-
 2 files changed, 19 insertions(+), 8 deletions(-)
---
diff --git a/nepomuk-core-4.9.2-isEmpty_crash.patch b/nepomuk-core-4.9.2-isEmpty_crash.patch
index 11eec1c..94ee67c 100644
--- a/nepomuk-core-4.9.2-isEmpty_crash.patch
+++ b/nepomuk-core-4.9.2-isEmpty_crash.patch
@@ -1,16 +1,24 @@
 diff -up nepomuk-core-4.9.2/services/filewatch/nepomukfilewatch.cpp.isEmpty_crash nepomuk-core-4.9.2/services/filewatch/nepomukfilewatch.cpp
 --- nepomuk-core-4.9.2/services/filewatch/nepomukfilewatch.cpp.isEmpty_crash	2012-09-27 19:43:41.000000000 -0500
-+++ nepomuk-core-4.9.2/services/filewatch/nepomukfilewatch.cpp	2012-10-02 19:59:27.799816463 -0500
-@@ -322,9 +322,11 @@ void Nepomuk2::FileWatch::connectToKDirW
- #ifdef BUILD_KINOTIFY
++++ nepomuk-core-4.9.2/services/filewatch/nepomukfilewatch.cpp	2012-10-03 17:14:12.256729214 -0500
+@@ -114,6 +114,7 @@ namespace {
+ 
+ Nepomuk2::FileWatch::FileWatch( QObject* parent, const QList<QVariant>& )
+     : Service( parent )
++    , m_dirWatch( 0 )
+ {
+     // Create the configuration instance singleton (for thread-safety)
+     // ==============================================================
+@@ -323,8 +324,11 @@ void Nepomuk2::FileWatch::connectToKDirW
  void Nepomuk2::FileWatch::slotInotifyWatchUserLimitReached()
  {
--    // we do it the brutal way for now hoping with new kernels and defaults this will never happen
+     // we do it the brutal way for now hoping with new kernels and defaults this will never happen
 -    delete m_dirWatch;
-+    if (m_dirWatch) {
+-    m_dirWatch = 0;
 +    // Delete the KInotify and switch to KDirNotify dbus signals
-+    m_dirWatch->deleteLater();
-     m_dirWatch = 0;
++    if (m_dirWatch) {
++        m_dirWatch->deleteLater();
++        m_dirWatch = 0;
 +    }
      connectToKDirWatch();
  }
diff --git a/nepomuk-core.spec b/nepomuk-core.spec
index d3800c5..844d7fc 100644
--- a/nepomuk-core.spec
+++ b/nepomuk-core.spec
@@ -9,7 +9,7 @@
 
 Name:    nepomuk-core
 Version: 4.9.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Nepomuk Core utilities and libraries
 
 License: LGPLv2 or LGPLv3
@@ -145,6 +145,9 @@ make -C %{_target_platform}/autotests/test test  ||:
 
 
 %changelog
+* Wed Oct 03 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.2-5
+- respin isEmpty_crash based on 32b44881 upstream commit (#858271)
+
 * Tue Oct 02 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.2-4
 - respin isEmpty_crash patch to guard against NULL (#858271)