rpms/kdelibs4/F-8 kdelibs-4.1.2-kde#172182-http_cache_cleaner.patch, NONE, 1.1 kdelibs4.spec, 1.40, 1.41 kdelibs-4.1.2-googlemaps.patch, 1.1, NONE kdelibs-4.1.2-kde#171870-kded-crash.patch, 1.1, NONE kdelibs-4.1.3-kde#172042-windowsize.patch, 1.1, NONE

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18034/F-8

Modified Files:
	kdelibs4.spec 
Added Files:
	kdelibs-4.1.2-kde#172182-http_cache_cleaner.patch 
Removed Files:
	kdelibs-4.1.2-googlemaps.patch 
	kdelibs-4.1.2-kde#171870-kded-crash.patch 
	kdelibs-4.1.3-kde#172042-windowsize.patch 
Log Message:
Sync from kdelibs/F-9:

* Fri Nov 07 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-2
- backport http_cache_cleaner fix (kdebug:172182)

* Tue Nov  4 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.3-1
- KDE 4.1.3

kdelibs-4.1.2-kde#172182-http_cache_cleaner.patch:

--- NEW FILE kdelibs-4.1.2-kde#172182-http_cache_cleaner.patch ---
diff -up kdelibs-4.1.2/kioslave/http/http_cache_cleaner.cpp.kde#172182 kdelibs-4.1.2/kioslave/http/http_cache_cleaner.cpp
--- kdelibs-4.1.2/kioslave/http/http_cache_cleaner.cpp.kde#172182	2008-05-21 06:07:42.000000000 -0500
+++ kdelibs-4.1.2/kioslave/http/http_cache_cleaner.cpp	2008-11-07 07:58:32.000000000 -0600
@@ -50,7 +50,7 @@ int m_maxCacheSize;
 static const char appFullName[] = "org.kde.kio_http_cache_cleaner";
 static const char appName[] = "kio_http_cache_cleaner";
 
-static const char version[] = "1.0.0";
+static const char version[] = "9";
 
 struct FileInfo {
    QString name;
@@ -73,8 +73,8 @@ public:
 };
 
 // !START OF SYNC!
-// Keep the following in sync with the cache code in http.cc
-#define CACHE_REVISION "7\n"
+// Keep the following in sync with the cache code in http.cpp
+#define CACHE_REVISION "9\n"
 
 FileInfo *readEntry( const QString &filename)
 {


Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs4.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kdelibs4.spec	15 Oct 2008 15:29:17 -0000	1.40
+++ kdelibs4.spec	12 Nov 2008 22:13:39 -0000	1.41
@@ -1,8 +1,8 @@
 %define _default_patch_fuzz 2
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.1.2
-Release: 5%{?dist}
+Version: 4.1.3
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -78,9 +78,7 @@
 Patch20: kdelibs-4.1.1-cmake.patch
 
 ## upstream patches
-Patch100: kdelibs-4.1.2-googlemaps.patch
-Patch101: kdelibs-4.1.2-kde#171870-kded-crash.patch
-Patch102: kdelibs-4.1.3-kde#172042-windowsize.patch
+Patch103: kdelibs-4.1.2-kde#172182-http_cache_cleaner.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -206,12 +204,10 @@
 %patch20 -p1 -b .cmake
 
 ## upstream patches
-%patch100 -p0 -b .googlemaps
-%patch101 -p0 -b .kde#171870-kded-crash
-%patch102 -p0 -b .kde#172042-windowsize
+%patch103 -p1 -b .kde#172182-http_cache_cleaner
 
-%build
 
+%build
 mkdir -p %{_target_platform}
 pushd %{_target_platform} 
 %{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
@@ -369,6 +365,12 @@
 
 
 %changelog
+* Fri Nov 07 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-2
+- backport http_cache_cleaner fix (kdebug:172182)
+
+* Tue Nov  4 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.3-1
+- KDE 4.1.3
+
 * Wed Oct 15 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.2-5
 - backport fix for faulty window resizing (kdebug:172042)
 


--- kdelibs-4.1.2-googlemaps.patch DELETED ---


--- kdelibs-4.1.2-kde#171870-kded-crash.patch DELETED ---


--- kdelibs-4.1.3-kde#172042-windowsize.patch DELETED ---