[kdelibs] - 4.5.2

Rex Dieter rdieter at fedoraproject.org
Fri Oct 1 14:17:26 UTC 2010


commit db35356eb7ff70da2c8f20f90f7cb93099344caa
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 1 09:23:11 2010 -0500

    - 4.5.2

 .gitignore                                         |    2 +-
 kdelibs.spec                                       |   16 +-
 ....5.1_fix_kdevelop-crash_katetextblock_cpp.patch |   19 --
 ....1_fix_kdevelop-crash_katetexthistory_cpp.patch |  289 --------------------
 ....5.1_fix_kdevelop-crash_katetexthistory_h.patch |   28 --
 sources                                            |    2 +-
 6 files changed, 8 insertions(+), 348 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 06b7e74..500dbc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-kdelibs-4.5.1.tar.bz2
+/kdelibs-4.5.2.tar.bz2
diff --git a/kdelibs.spec b/kdelibs.spec
index 23d345e..3bfacda 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -11,8 +11,8 @@
 #define apidocs_qch 1
 
 Summary: KDE Libraries
-Version: 4.5.1
-Release: 4%{?dist}
+Version: 4.5.2
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -82,10 +82,6 @@ Patch24: kdelibs-4.3.1-drkonq.patch
 # paths (like /usr/lib64) already! With this, we can drop
 # -DCMAKE_SKIP_RPATH:BOOL=ON (finally)
 Patch27: kdelibs-4.4.80-no_rpath.patch
-# patches backported, fixed in coming 4.5.2, fix crashing kdevelop
-Patch30: kdelibs_4.5.1_fix_kdevelop-crash_katetextblock_cpp.patch
-Patch31: kdelibs_4.5.1_fix_kdevelop-crash_katetexthistory_cpp.patch
-Patch32: kdelibs_4.5.1_fix_kdevelop-crash_katetexthistory_h.patch
 
 ## upstreamable
 # add gpg2 support to knewstuff, rough first try s/gpg/gpg2/
@@ -93,7 +89,7 @@ Patch32: kdelibs_4.5.1_fix_kdevelop-crash_katetexthistory_h.patch
 # TODO: try to use either gpg or gpg2, whichever is available
 Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
 
-## 4.4 upstream
+## 4.5 upstream
 
 ## trunk upstream
 
@@ -260,9 +256,6 @@ format for use with the Qt 4 Assistant or KDevelop 4.
 %patch50 -p1 -b .knewstuff_gpg2
 
 # upstream patches
-%patch30 -p0
-%patch31 -p0
-%patch32 -p0
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -510,6 +503,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 01 2010 Rex Dieter <rdieter at fedoraproject.org> 4.5.2-1
+- 4.5.2
+
 * Fri Sep 10 2010 Thomas Janssen <thomasj at fedoraproject.org> 4.5.1-4
 - backport patches to fix a crashing kdevelop (kde 4.5.1 only)
 
diff --git a/sources b/sources
index e469816..9c31443 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f91f16b4349f8a2ca41dab5ca95f3877  kdelibs-4.5.1.tar.bz2
+be66ec28293f5bed92212a740ded2e5e  kdelibs-4.5.2.tar.bz2


More information about the scm-commits mailing list