[kdelibs/f15] 4.6.4

[Than Ngo]

commit 5bb5ea39afd896e2afe9447e55fd73b6220b53cc
Author: Than Ngo <than at redhat.com>
Date:   Mon Jun 6 22:42:32 2011 +0200

    4.6.4

 .gitignore                                         |    1 +
 kdelibs-4.6.3-kde258706.patch                      |  114 --------------------
 kdelibs-4.6.3-kio-double-requests-kde#272466.patch |   27 -----
 kdelibs.spec                                       |   17 ++--
 sources                                            |    2 +-
 5 files changed, 9 insertions(+), 152 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ea33c81..1e25706 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /kdelibs-4.6.2.tar.bz2
 /kdelibs-4.6.3.tar.bz2
+/kdelibs-4.6.4.tar.bz2
diff --git a/kdelibs.spec b/kdelibs.spec
index 2216e89..2318799 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -15,8 +15,8 @@
 %endif
 
 Summary: KDE Libraries
-Version: 4.6.3
-Release: 5%{?dist}
+Version: 4.6.4
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -95,11 +95,7 @@ Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
 # https://git.reviewboard.kde.org/r/101231/
 Patch51: kdelibs-4.6.2-uri_mimetypes.patch
 
-## upstream
-# https://projects.kde.org/projects/kde/kdelibs/repository/revisions/a8d16682c31ef523ffebba6e19283a19cd5f5627/diff
-Patch100: kdelibs-4.6.3-kde258706.patch
-# https://projects.kde.org/projects/kde/kdelibs/repository/revisions/92db24adfa941003db1d885df01157056617f30b/diff
-Patch101: kdelibs-4.6.3-kio-double-requests-kde#272466.patch
+## 4.6 upstream
 
 ## security fix
 # Not Upstreamed? why not ? -- Rex
@@ -285,9 +281,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch50 -p1 -b .knewstuff_gpg2
 %patch51 -p1 -b .uri_mimetypes
 
-# upstream patches
-%patch100 -p1 -b .kde258706
-%patch101 -p1 -b .kde272466
+# 4.6 upstream patches
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -543,6 +537,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jun 06 2011 Than Ngo <than at redhat.com> - 4.6.4-1
+- 4.6.4
+
 * Tue May 24 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.6.3-5
 - fix kio regression causing requests submitted twice (#707146, kde#272466)
 
diff --git a/sources b/sources
index 92d8a90..76ec247 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-923a7e8f89aa504647e14472b24b8c0a  kdelibs-4.6.3.tar.bz2
+d38a8bf5b2002f9014727cec4395ba2a  kdelibs-4.6.4.tar.bz2