[kdelibs] 4.11.97

[Rex Dieter]

commit 3de52986bd91af928ce24f444fa2443da93980ca
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 30 21:40:51 2013 -0600

    4.11.97

 .gitignore                                         |    3 +--
 ...rs.patch => kdelibs-4.11.97-kstandarddirs.patch |   19 +++++++++----------
 kdelibs.spec                                       |    9 ++++++---
 sources                                            |    2 +-
 4 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e27f2a1..602d4f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 /kdelibs-4.11.3.tar.xz
-/kdelibs-4.11.90.tar.xz
-/kdelibs-4.11.95.tar.xz
+/kdelibs-4.11.97.tar.xz
diff --git a/kdelibs-4.10.0-kstandarddirs.patch b/kdelibs-4.11.97-kstandarddirs.patch
similarity index 55%
rename from kdelibs-4.10.0-kstandarddirs.patch
rename to kdelibs-4.11.97-kstandarddirs.patch
index c5de6df..f6b8ecd 100644
--- a/kdelibs-4.10.0-kstandarddirs.patch
+++ b/kdelibs-4.11.97-kstandarddirs.patch
@@ -1,19 +1,18 @@
-diff -up kdelibs-4.10.0/kdecore/kernel/kstandarddirs.cpp.kstandarddirs kdelibs-4.10.0/kdecore/kernel/kstandarddirs.cpp
---- kdelibs-4.10.0/kdecore/kernel/kstandarddirs.cpp.kstandarddirs	2013-01-31 07:44:58.336676504 -0600
-+++ kdelibs-4.10.0/kdecore/kernel/kstandarddirs.cpp	2013-01-31 07:44:58.340676454 -0600
-@@ -1153,7 +1153,9 @@ QStringList KStandardDirs::KStandardDirs
+diff -up kdelibs-4.11.97/kdecore/kernel/kstandarddirs.cpp.kstandarddirs kdelibs-4.11.97/kdecore/kernel/kstandarddirs.cpp
+--- kdelibs-4.11.97/kdecore/kernel/kstandarddirs.cpp.kstandarddirs	2013-11-30 21:24:01.637163800 -0600
++++ kdelibs-4.11.97/kdecore/kernel/kstandarddirs.cpp	2013-11-30 21:35:27.166292739 -0600
+@@ -1149,7 +1149,8 @@ QStringList KStandardDirs::KStandardDirs
                   pit != prefixList->end();
                   ++pit)
              {
--            if((*pit)!=installprefix||installdir.isEmpty())
-+            // "exe" never has a custom install path, and the check triggers
-+            // a false positive due to the libexecdir patch
-+            if((*pit)!=installprefix||installdir.isEmpty()||!strcmp("exe", type))
+-            if((*pit).compare(installprefix, cs) != 0 || installdir.isEmpty())
++            // "exe" never has a custom install path, and the check triggers a false positive due to the libexecdir patch
++            if((*pit).compare(installprefix, cs) != 0 || installdir.isEmpty() || !strcmp("exe", type))
              {
                      for (QStringList::ConstIterator it = dirs.constBegin();
                           it != dirs.constEnd(); ++it)
-@@ -1171,6 +1173,11 @@ QStringList KStandardDirs::KStandardDirs
-                         if ((local || testdir.exists()) && !candidates.contains(path))
+@@ -1163,6 +1164,11 @@ QStringList KStandardDirs::KStandardDirs
+                         if ((local || testdir.exists()) && !candidates.contains(path, cs))
                              candidates.append(path);
                      }
 +                    // special-case "config" (forward porting Chris Cheney's
diff --git a/kdelibs.spec b/kdelibs.spec
index c43f7f5..0dde315 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -36,8 +36,8 @@
 %global _changelog_trimtime %(date +%s -d "1 year ago")
 
 Summary: KDE Libraries
-Version: 4.11.95
-Release: 2%{?dist}
+Version: 4.11.97
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -103,7 +103,7 @@ Patch12: kdelibs-4.10.0-xdg-menu.patch
 Patch14: kdelibs-4.11.3-libexecdir.patch
 
 # kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir}
-Patch18: kdelibs-4.10.0-kstandarddirs.patch
+Patch18: kdelibs-4.11.97-kstandarddirs.patch
 
 # set build type
 Patch20: kdelibs-4.10.0-cmake.patch
@@ -604,6 +604,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 
 %changelog
+* Sun Dec 01 2013 Rex Dieter <rdieter at fedoraproject.org> - 6:4.11.97-1
+- 4.11.97
+
 * Wed Nov 27 2013 Rex Dieter <rdieter at fedoraproject.org> 6:4.11.95-2
 - rebuild (openexr)
 
diff --git a/sources b/sources
index ae3c473..7cbc75f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4f148f5248d3d04e33fd1affdb049ba3  kdelibs-4.11.95.tar.xz
+a9c044cf48bc591894d3c4d5ad5be475  kdelibs-4.11.97.tar.xz