[kdelibs/f15] 4.6.5

Rex Dieter rdieter at fedoraproject.org
Fri Jul 1 13:07:06 UTC 2011


commit 41f729511001dd6368d6f40c76a4b2a5abe30fe5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jul 1 08:06:54 2011 -0500

    4.6.5

 .gitignore                          |    4 +---
 kdelibs-4.6.80-kconfigxt-qt48.patch |   33 ---------------------------------
 kdelibs.spec                        |   11 +++++------
 sources                             |    2 +-
 4 files changed, 7 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1e25706..1590677 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/kdelibs-4.6.2.tar.bz2
-/kdelibs-4.6.3.tar.bz2
-/kdelibs-4.6.4.tar.bz2
+/kdelibs-4.6.5.tar.bz2
diff --git a/kdelibs.spec b/kdelibs.spec
index e8a8d91..389fcfd 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -15,8 +15,8 @@
 %define halectomy 1
 
 Summary: KDE Libraries
-Version: 4.6.4
-Release: 6%{?dist}
+Version: 4.6.5
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -101,9 +101,6 @@ Patch51: kdelibs-4.6.2-uri_mimetypes.patch
 Patch52: kdelibs-4.6.80-kstatusnotifieritem_dbus_leak.patch
 
 ## 4.6 upstream
-# https://projects.kde.org/projects/kde/kdelibs/repository/revisions/d44186bce4670d2985fb6aba8dba59bbd2c4c77a
-# fix KConfigXT KComboBox for Qt 4.8 TP1
-Patch100: kdelibs-4.6.80-kconfigxt-qt48.patch
 # fix docbook-style-xsl borkage
 Patch101: kdelibs-4.6.4-kdoctools_docbook.patch 
 # http://bugzilla.redhat.com/667787
@@ -290,7 +287,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch51 -p1 -b .uri_mimetypes
 
 # 4.6 upstream patches
-%patch100 -p1 -b .kconfigxt-qt48
 %patch101 -p1 -b .kdoctools_docbook
 %patch102 -p1 -b .kstatusnotifieritemdbus_leak
 
@@ -548,6 +544,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jul 01 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.5-1
+- 4.6.5
+
 * Thu Jun 30 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.4-6
 - better (upstream) fix for kstatusnotifieritemdbus leak (#667787, kde#261180)
 
diff --git a/sources b/sources
index 76ec247..4cb313b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d38a8bf5b2002f9014727cec4395ba2a  kdelibs-4.6.4.tar.bz2
+8ca933c00bb5089e0793756e69bd1275  kdelibs-4.6.5.tar.bz2


More information about the scm-commits mailing list