[kdelibs] 6:4.11.1-1

[Rex Dieter]

commit 0509005e1ebf8762043174fa6e89fd790da875c9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 3 12:07:19 2013 -0500

    6:4.11.1-1
    
    - 4.11.1
    - include SOLID_HAL_LEGACY hack (el6)

 .gitignore                                         |    3 +-
 ...on-of-lzma-and-xz-tar-archives-downloaded.patch |   27 ----------
 ...and-lzma-compressed-tars-in-PackageStruct.patch |   26 ----------
 ...quest-theme-does-not-exist-delete-all-old.patch |   51 --------------------
 SOLID_HAL_LEGACY.sh                                |    6 ++
 kdelibs.spec                                       |   28 ++++++-----
 sources                                            |    2 +-
 7 files changed, 24 insertions(+), 119 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 633aab0..cf2d67b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 /kdelibs-4.10.5.tar.xz
-/kdelibs-4.10.97.tar.xz
-/kdelibs-4.11.0.tar.xz
+/kdelibs-4.11.1.tar.xz
diff --git a/SOLID_HAL_LEGACY.sh b/SOLID_HAL_LEGACY.sh
new file mode 100644
index 0000000..fc27874
--- /dev/null
+++ b/SOLID_HAL_LEGACY.sh
@@ -0,0 +1,6 @@
+
+if [ -z "${SOLID_HAL_LEGACY}" ] ; then
+  SOLID_HAL_LEGACY=1
+  export SOLID_HAL_LEGACY
+fi
+
diff --git a/kdelibs.spec b/kdelibs.spec
index 3c94fa1..b4d85a6 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -20,6 +20,7 @@
 %endif
 %if 0%{?rhel} == 6
 %define hal 1
+Source10: SOLID_HAL_LEGACY.sh
 %define cmake_pkg cmake28
 %else
 %define cmake_pkg cmake
@@ -36,8 +37,8 @@
 %global _changelog_trimtime %(date +%s -d "1 year ago")
 
 Summary: KDE Libraries
-Version: 4.11.0
-Release: 2%{?dist}
+Version: 4.11.1
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -167,10 +168,6 @@ Patch092: return-application-icons-properly.patch
 # revert disabling of packagekit
 Patch093: turn-the-packagekit-support-feature-off-by-default.patch
 
-Patch102: 0002-Fix-detection-of-lzma-and-xz-tar-archives-downloaded.patch 
-Patch103: 0003-Support-xz-and-lzma-compressed-tars-in-PackageStruct.patch 
-Patch104: 0004-when-the-request-theme-does-not-exist-delete-all-old.patch 
-
 ## security fix
 
 # rhel patches
@@ -364,10 +361,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch092 -p1 -R -b .return-application-icons-properly
 %patch093 -p1 -R -b .turn-the-packagekit-support-feature-off-by-default
 
-%patch102 -p1 -b .0002
-%patch103 -p1 -b .0003
-%patch104 -p1 -b .0004
-
 # security fixes
 
 # rhel patches
@@ -468,6 +461,10 @@ done
 %endif
 %endif
 
+%if 0%{?hal:1}
+install -p -m644 -D %{SOURCE10} /etc/kde/env/SOLID_HAL_LEGACY.sh
+%endif
+
 
 %post
 /sbin/ldconfig
@@ -490,6 +487,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 %files
 %doc AUTHORS README TODO
 %doc COPYING.LIB
+%if 0%{?hal:1}
+/etc/kde/env/SOLID_HAL_LEGACY.sh
+%endif
 %{_kde4_bindir}/checkXML
 %{_kde4_bindir}/kbuildsycoca4
 %{_kde4_bindir}/kcookiejar4
@@ -609,10 +609,14 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 
 %changelog
-* Wed Aug 14 2013 Rex Dieter <rdieter at fedoraproject.org> 4.11.0-2
+* Tue Sep 03 2013 Rex Dieter <rdieter at fedoraproject.org> - 6:4.11.1-1
+- 4.11.1
+- include SOLID_HAL_LEGACY hack (el6)
+
+* Wed Aug 14 2013 Rex Dieter <rdieter at fedoraproject.org> 6:4.11.0-2
 - upstream patches, including plasma crasher fix (kde#320855)
 
-* Thu Aug 08 2013 Than Ngo <than at redhat.com> - 4.11.0-1
+* Thu Aug 08 2013 Than Ngo <than at redhat.com> - 6:4.11.0-1
 - 4.11.0
 
 * Thu Jul 25 2013 Rex Dieter <rdieter at fedoraproject.org> - 6:4.10.97-1
diff --git a/sources b/sources
index 9a36dc0..cfc0dd7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aed073e5f5d189628ed14059b4686133  kdelibs-4.11.0.tar.xz
+94673d3c379a673f7ee89527c7514bea  kdelibs-4.11.1.tar.xz