rpms/kdelibs/devel kdelibs-4.0.2-branding.patch, 1.2, 1.3 kdelibs-4.3.90-install_all_css.patch, NONE, 1.1 .cvsignore, 1.85, 1.86 kdelibs.spec, 1.564, 1.565 sources, 1.102, 1.103 kdelibs-4.0.0-openssl.patch, 1.1, NONE kdelibs-4.0.2-install-all-css.patch, 1.2, NONE

Wed Jan 6 19:50:20 UTC 2010

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv972

Modified Files:
	.cvsignore kdelibs.spec sources 
Added Files:
	kdelibs-4.0.2-branding.patch 
	kdelibs-4.3.90-install_all_css.patch 
Removed Files:
	kdelibs-4.0.0-openssl.patch 
	kdelibs-4.0.2-install-all-css.patch 
Log Message:
* Wed Jan 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-1
- 4.3.90 (4.4rc1)
- drop openssl patch (no longer needed since bug #429846 fixed)


kdelibs-4.0.2-branding.patch:
 kprotocolmanager.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: kdelibs-4.0.2-branding.patch
===================================================================
RCS file: kdelibs-4.0.2-branding.patch
diff -N kdelibs-4.0.2-branding.patch

--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ kdelibs-4.0.2-branding.patch	6 Jan 2010 19:50:20 -0000	1.3
@@ -0,0 +1,12 @@
+diff -up kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp.branding kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp
+--- kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp.branding	2008-01-04 18:00:15.000000000 -0600
++++ kdelibs-4.0.2/kio/kio/kprotocolmanager.cpp	2008-03-07 14:49:46.000000000 -0600
+@@ -73,7 +73,7 @@ KProtocolManagerPrivate::~KProtocolManag
+ 
+ // DEFAULT USERAGENT STRING
+ #define CFG_DEFAULT_UAGENT(X) \
+-QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko)") \
++QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko) Fedora/@@VERSION_RELEASE@@") \
+         .arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(X).arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(KDE_VERSION_RELEASE)
+ 
+ #define PRIVATE_DATA \

kdelibs-4.3.90-install_all_css.patch:
 CMakeLists.txt |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE kdelibs-4.3.90-install_all_css.patch ---
diff -up kdelibs-4.3.90/doc/common/CMakeLists.txt.all-css kdelibs-4.3.90/doc/common/CMakeLists.txt
--- kdelibs-4.3.90/doc/common/CMakeLists.txt.all-css	2010-01-06 10:58:53.000000000 -0600
+++ kdelibs-4.3.90/doc/common/CMakeLists.txt	2010-01-06 13:33:35.920884922 -0600
@@ -8,6 +8,8 @@ install(FILES
     kde-docs.css
     doxygen.css
     tabs.css
+    kde.css flat.css print.css
+    Doxyfile.global
     header.html
     footer.html
     mainheader.html


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- .cvsignore	18 Dec 2009 14:29:01 -0000	1.85
+++ .cvsignore	6 Jan 2010 19:50:19 -0000	1.86
@@ -1 +1 @@
-kdelibs-4.3.85.tar.bz2
+kdelibs-4.3.90.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.564
retrieving revision 1.565
diff -u -p -r1.564 -r1.565
--- kdelibs.spec	5 Jan 2010 17:12:44 -0000	1.564
+++ kdelibs.spec	6 Jan 2010 19:50:20 -0000	1.565
@@ -12,8 +12,8 @@
 %endif
 
 Summary: KDE Libraries
-Version: 4.3.85
-Release: 7%{?dist}
+Version: 4.3.90
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -60,15 +60,14 @@ Source2: kde4.csh
 Patch0: kdelibs-4.3.85-parallel_devel.patch
 # fix kde#149705
 Patch2: kdelibs-4.2.85-kde149705.patch
+## UPSTREAM ME
 # Hunspell support for K3Spell
 # http://fedoraproject.org/wiki/Releases/FeatureDictionary
 # http://bugs.kde.org/show_bug.cgi?id=154561
 Patch5: kdelibs-4.0.0-k3spell-hunspell.patch
-# openssl's SHLIB_VERSION_NUMBER macro can't be used/trusted
-Patch6: kdelibs-4.0.0-openssl.patch
 # install all .css files and Doxyfile.global in kdelibs-common to build
 # kdepimlibs-apidocs against
-Patch8: kdelibs-4.0.2-install-all-css.patch
+Patch8: kdelibs-4.3.90-install_all_css.patch
 # add Fedora/V-R to KHTML UA string
 Patch9: kdelibs-4.0.2-branding.patch
 # don't cache kdeglobals paths because they change after profile directories
@@ -76,12 +75,15 @@ Patch9: kdelibs-4.0.2-branding.patch
 Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
 # workaround for policykit
 Patch11: kdelibs-4.3.80-policykit-workaround.patch
+# COMMENT ME PLEASE 
 Patch12: kdelibs-4.1.0-xdg-menu.patch
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
 Patch14: kdelibs-4.2.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
 Patch18: kdelibs-4.1.72-kstandarddirs.patch
+# COMMENT ME PLEASE
 Patch20: kdelibs-4.1.70-cmake.patch
+# disable drkonqi by default, fedora prefers/wants abrt
 Patch24: kdelibs-4.3.1-drkonq.patch
 # use -fno-var-tracking-assignments on khtml/svg bits, use in a pinch on f12+
 # workaound for low-mem systems (ppc64), tracking here (for now),
@@ -217,7 +219,7 @@ format for easy browsing.
 %patch0 -p1 -b .parallel_devel
 %patch2 -p1 -b .kde149705
 %patch5 -p1 -b .k3spell-hunspell
-%patch8 -p1 -b .all-css
+%patch8 -p1 -b .install_all_css
 %patch9 -p1 -b .branding
 %patch11 -p1 -b .policykit
 %patch12 -p1 -b .Administration-menu
@@ -443,6 +445,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jan 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-1
+- 4.3.90 (4.4rc1)
+- drop openssl patch (no longer needed since bug #429846 fixed)
+
 * Tue Jan 05 2010 Jaroslav Reznik <jreznik at redhat.com> - 4.3.85-7
 - PolkitQt rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/sources,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- sources	19 Dec 2009 16:19:10 -0000	1.102
+++ sources	6 Jan 2010 19:50:20 -0000	1.103
@@ -1 +1 @@
-4bf066d2f489d7d00263ac5a8e787c23  kdelibs-4.3.85.tar.bz2
+45c42bfcaa5a968a38e20a0599c4e8e9  kdelibs-4.3.90.tar.bz2


--- kdelibs-4.0.0-openssl.patch DELETED ---


--- kdelibs-4.0.2-install-all-css.patch DELETED ---


