From 384716c152cb92c01393b38f9501a00056725ed9 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Fri, 2 Sep 2011 12:39:48 +0200
Subject: [PATCH] 4.7.1

---
 .gitignore                 |  1 +
 kdelibs-4.3.1-drkonq.patch | 12 ------------
 kdelibs.spec               | 16 ++++++----------
 sources                    |  2 +-
 4 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 kdelibs-4.3.1-drkonq.patch

diff --git a/.gitignore b/.gitignore
index d4e0698..8f289a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /kdelibs-4.7.0.tar.bz2
+/kdelibs-4.7.1.tar.bz2
diff --git a/kdelibs-4.3.1-drkonq.patch b/kdelibs-4.3.1-drkonq.patch
deleted file mode 100644
index 060a4da..0000000
--- a/kdelibs-4.3.1-drkonq.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up kdelibs-4.3.1/kdeui/util/kcrash.cpp.orig kdelibs-4.3.1/kdeui/util/kcrash.cpp
---- kdelibs-4.3.1/kdeui/util/kcrash.cpp.orig	2009-09-21 17:42:19.000000000 +0200
-+++ kdelibs-4.3.1/kdeui/util/kcrash.cpp	2009-09-21 17:43:44.000000000 +0200
-@@ -67,7 +67,7 @@ static char *s_autoRestartCommand = 0;
- static char *s_appPath = 0;
- static char *s_drkonqiPath = 0;
- static KCrash::CrashFlags s_flags = 0;
--static bool s_launchDrKonqi = true;
-+static bool s_launchDrKonqi = false;
- 
- namespace KCrash
- {
diff --git a/kdelibs.spec b/kdelibs.spec
index 054de10..863a942 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -1,4 +1,3 @@
-
 %define attica_ver 0.2.0
 %define dbusmenu_qt_ver 0.5.2
 %define phonon_ver 4.5.0
@@ -17,10 +16,11 @@
 %global shared_desktop_ontologies_version %(pkg-config --modversion shared-desktop-ontologies 2>/dev/null || echo %{shared_desktop_ontologies_ver})
 %global soprano_version %(pkg-config --modversion soprano 2>/dev/null || echo %{soprano_ver})
 %global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver})
+%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
 
 Summary: KDE Libraries
-Version: 4.7.0
-Release: 5%{?dist}
+Version: 4.7.1
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -41,7 +41,6 @@ BuildRequires: kde-filesystem >= 4-23
 BuildRequires: kde-settings
 BuildRequires: docbook-dtds docbook-style-xsl
 Requires: ca-certificates
-%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
 Requires: dbusmenu-qt%{?_isa} >= %{dbusmenu_qt_version}
 Requires: docbook-dtds docbook-style-xsl
 Requires: hicolor-icon-theme
@@ -90,9 +89,6 @@ Patch18: kdelibs-4.6.90-kstandarddirs.patch
 # set build type
 Patch20: kdelibs-4.1.70-cmake.patch
 
-# disable drkonqi by default, RHEL prefers/wants abrt
-Patch24: kdelibs-4.3.1-drkonq.patch
-
 # die rpath die, since we're using standard paths, we can avoid
 # this extra hassle (even though cmake is *supposed* to not add standard
 # paths (like /usr/lib64) already! With this, we can drop
@@ -307,9 +303,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
-%if 0%{?rhel} > 5
-%patch24 -p1 -b .drkonq
-%endif
 %patch27 -p1 -b .no_rpath
 
 # libplasma PackageKit integration
@@ -575,6 +568,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Sep 02 2011 Than Ngo <than@redhat.com> - 4.7.1-1
+- 4.7.1
+
 * Tue Aug 30 2011 Than Ngo <than@redhat.com> - 4.7.0-5
 - clean up fedora conditonals
 
diff --git a/sources b/sources
index 01c9c2e..4f7ba97 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1d12b9c32da28b38f64718cf10527e80  kdelibs-4.7.0.tar.bz2
+eaeacc3c94501f343eb7c4ef74c7475b  kdelibs-4.7.1.tar.bz2