[kdelibs/f18] - disable kfileplacesdevicecache which causes bad regression - add rhel condition

[Than Ngo]

commit 92f040cd34dd2bbfe5973e4018701b10b313ba5b
Author: Than Ngo <than at redhat.com>
Date:   Tue Dec 4 18:02:25 2012 +0100

    - disable kfileplacesdevicecache which causes bad regression
    - add rhel condition

 kdelibs-4.9.3-dot.patch |   12 ++++++++++++
 kdelibs.spec            |   14 +++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)
---
diff --git a/kdelibs-4.9.3-dot.patch b/kdelibs-4.9.3-dot.patch
new file mode 100644
index 0000000..2bca78d
--- /dev/null
+++ b/kdelibs-4.9.3-dot.patch
@@ -0,0 +1,12 @@
+diff -up kdelibs-4.9.3/doc/common/Doxyfile.global.me kdelibs-4.9.3/doc/common/Doxyfile.global
+--- kdelibs-4.9.3/doc/common/Doxyfile.global.me	2012-12-04 16:57:09.239184154 +0100
++++ kdelibs-4.9.3/doc/common/Doxyfile.global	2012-12-04 16:57:13.157191451 +0100
+@@ -1392,7 +1392,7 @@ HIDE_UNDOC_RELATIONS   = NO
+ # toolkit from AT&T and Lucent Bell Labs. The other options in this section
+ # have no effect if this option is set to NO (the default)
+ 
+-HAVE_DOT               = YES
++HAVE_DOT               = NO
+ 
+ # By default doxygen will write a font called FreeSans.ttf to the output
+ # directory and reference it in all dot files that doxygen generates. This
diff --git a/kdelibs.spec b/kdelibs.spec
index 34c91fa..011e1f0 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -25,7 +25,7 @@
 
 Summary: KDE Libraries
 Version: 4.9.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -125,7 +125,9 @@ Patch45: kdelibs-4.7.3-halectomy.patch
 Patch47: kdelibs-udisks2-backend.patch
 
 # cache to improve performance of apps using Solid with udisks2 (#868530)
-Patch48: kdelibs-udisks2-kfileplacesdevicecache.patch
+# disable now, this patch causes new regression, backend devices are destroyed!
+# the latest solid backend works fine without this patch
+# Patch48: kdelibs-udisks2-kfileplacesdevicecache.patch
 
 ## upstreamable
 # knewstuff2 variant of:
@@ -169,6 +171,7 @@ Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
 
 # rhel patches
 Patch300: kdelibs-4.8.3-webkit.patch
+Patch301: kdelibs-4.9.3-dot.patch
 
 # kmailservice moved here
 Conflicts: kdelibs3 < 3.5.10-38
@@ -319,7 +322,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 
 %if "%{?udisks}" == "udisks2"
 %patch47 -p1 -b .udisks2backend
-%patch48 -p1 -b .kfileplacesdevicescache
+#patch48 -p1 -b .kfileplacesdevicescache
 %else
 %patch45 -p1 -b .halectomy
 %endif
@@ -343,6 +346,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 # rhel patches
 %if 0%{?rhel}
 %patch300 -p1 -b .webkit
+%patch301 -p1 -b .dot
 %endif
 
 %build
@@ -594,6 +598,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 04 2012 Than Ngo <than at redhat.com> - 6:4.9.4-2
+- disable kfileplacesdevicecache which causes bad regression 
+- add rhel condition
+
 * Mon Dec 03 2012 Than Ngo <than at redhat.com> - 6:4.9.4-1
 - 4.9.4
 - update udisks2 backend patch to fix ghost devices