[kdelibs/f17] 4.8.5

[Rex Dieter]

commit 74c04c61979517aa06cfac5247cff4baaf27b7a9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Aug 2 08:35:48 2012 -0500

    4.8.5

 .gitignore                             |    4 +---
 kdelibs-4.8-solid_cd_eject.patch       |   13 -------------
 kdelibs-4.8.4-nepomuk-regression.patch |   15 ---------------
 kdelibs.spec                           |   18 +++++-------------
 sources                                |    2 +-
 5 files changed, 7 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e61cce1..0eb4ae3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/kdelibs-4.6.5.tar.bz2
-/kdelibs-4.8.3.tar.xz
-/kdelibs-4.8.4.tar.xz
+/kdelibs-4.8.5.tar.xz
diff --git a/kdelibs.spec b/kdelibs.spec
index e17df24..7ecbeb2 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -24,8 +24,8 @@
 %global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
 
 Summary: KDE Libraries
-Version: 4.8.4
-Release: 8%{?dist}
+Version: 4.8.5
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -145,18 +145,9 @@ Patch53: kdelibs-4.7.2-kjs-s390.patch
 # return valid locale (RFC 1766)
 Patch54: kdelibs-4.8.4-kjs-locale.patch
 
-# CD drive tray goes back in after 'Eject' when dolphin is running
-# http://bugs.kde.org/296657
-# http://bugzilla.redhat.com/811609
-Patch55:  kdelibs-4.8-solid_cd_eject.patch
-
 ## upstream
 # fix kdeclarative install location (by wstephenson as found in kde-packager list)
 Patch100: kdelibs-4.8.3-kdeclarative-install-location.patch
-# bz#830178
-# http://commits.kde.org/kdelibs/76e0376d7582cfe5b898c56bf3779ca2279dace8
-# http://commits.kde.org/kdelibs/bde5aad1e9f7bfb6f8d5c60197797de4a315158d
-Patch101: kdelibs-4.8.4-nepomuk-regression.patch
 
 ## security fix
 # Not Upstreamed? why not ? -- Rex
@@ -365,11 +356,9 @@ popd
 %patch52 -p1 -b .SOLID_UPNP
 %patch53 -p1 -b .kjs-s390
 %patch54 -p1 -b .kjs-locale
-%patch55 -p1 -b .solid_cd_eject
 
 # upstream patches
 %patch100 -p1 -b .kdeclarative-install-location
-%patch101 -p1 -b .nepomuk-regression
 
 # security fixes
 %patch200 -p1 -b .CVE-2009-2702
@@ -625,6 +614,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 02 2012 Rex Dieter <rdieter at fedoraproject.org> - 6:4.8.5-1
+- 4.8.5
+
 * Fri Jul 13 2012 Rex Dieter <rdieter at fedoraproject.org> - 6:4.8.4-8
 - CD drive tray goes back in after 'Eject' when dolphin is running (kde#296657, #811609)
 
diff --git a/sources b/sources
index b24bf0b..91d3a8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-83e0de7d22d07503da9cf2e2ff7cea43  kdelibs-4.8.4.tar.xz
+d82620cf9c7996f687eb4cf11b90259d  kdelibs-4.8.5.tar.xz