From 1fe62c8a92bb1a474e141c025d4f2322ee23d0dd Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 6 Jan 2010 19:50:19 +0000 Subject: [PATCH] * Wed Jan 06 2010 Rex Dieter - 4.3.90-1 - 4.3.90 (4.4rc1) - drop openssl patch (no longer needed since bug #429846 fixed) --- .cvsignore | 2 +- kdelibs-4.0.0-openssl.patch | 25 ------------------------- kdelibs-4.0.2-branding.patch | 12 ++++++++++++ kdelibs-4.0.2-install-all-css.patch | 12 ------------ kdelibs-4.3.90-install_all_css.patch | 12 ++++++++++++ kdelibs.spec | 18 ++++++++++++------ sources | 2 +- 7 files changed, 38 insertions(+), 45 deletions(-) delete mode 100644 kdelibs-4.0.0-openssl.patch create mode 100644 kdelibs-4.0.2-branding.patch delete mode 100644 kdelibs-4.0.2-install-all-css.patch create mode 100644 kdelibs-4.3.90-install_all_css.patch diff --git a/.cvsignore b/.cvsignore index 76848cd..ed9cbdd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kdelibs-4.3.85.tar.bz2 +kdelibs-4.3.90.tar.bz2 diff --git a/kdelibs-4.0.0-openssl.patch b/kdelibs-4.0.0-openssl.patch deleted file mode 100644 index 4cc26a6..0000000 --- a/kdelibs-4.0.0-openssl.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up kdelibs-4.0.0/kio/kssl/kopenssl.cpp.openssl kdelibs-4.0.0/kio/kssl/kopenssl.cpp ---- kdelibs-4.0.0/kio/kssl/kopenssl.cpp.openssl 2008-01-04 18:00:20.000000000 -0600 -+++ kdelibs-4.0.0/kio/kssl/kopenssl.cpp 2008-01-23 06:58:32.000000000 -0600 -@@ -357,6 +357,10 @@ KOpenSSLProxy::KOpenSSLProxy() - #ifdef SHLIB_VERSION_NUMBER - << "libssl.so." SHLIB_VERSION_NUMBER - #endif -+ << "libssl.so.0.9.8g" -+ << "libssl.so.7" -+ << "libssl.so.0.9.8b" -+ << "libssl.so.6" - << "libssl.so" - << "libssl.so.0" - #endif -@@ -374,6 +378,10 @@ KOpenSSLProxy::KOpenSSLProxy() - #ifdef SHLIB_VERSION_NUMBER - << "libcrypto.so." SHLIB_VERSION_NUMBER - #endif -+ << "libcrypto.so.0.9.8g" -+ << "libcrypto.so.7" -+ << "libcrypto.so.0.9.8b" -+ << "libcrypto.so.6" - << "libcrypto.so" - << "libcrypto.so.0" - #endif diff --git a/kdelibs-4.0.2-branding.patch b/kdelibs-4.0.2-branding.patch new file mode 100644 index 0000000..7fc0e95 --- /dev/null +++ b/kdelibs-4.0.2-branding.patch @@ -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 \ diff --git a/kdelibs-4.0.2-install-all-css.patch b/kdelibs-4.0.2-install-all-css.patch deleted file mode 100644 index 4d3e45f..0000000 --- a/kdelibs-4.0.2-install-all-css.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur kdelibs-4.0.2/doc/common/CMakeLists.txt kdelibs-4.0.2-install-all-css/doc/common/CMakeLists.txt ---- kdelibs-4.0.2/doc/common/CMakeLists.txt 2008-01-05 01:00:05.000000000 +0100 -+++ kdelibs-4.0.2-install-all-css/doc/common/CMakeLists.txt 2008-03-06 05:18:11.000000000 +0100 -@@ -7,6 +7,8 @@ - xml.dcl - doxygen.css - tabs.css -+ kde.css flat.css print.css -+ Doxyfile.global - header.html - footer.html - mainheader.html diff --git a/kdelibs-4.3.90-install_all_css.patch b/kdelibs-4.3.90-install_all_css.patch new file mode 100644 index 0000000..71325fb --- /dev/null +++ b/kdelibs-4.3.90-install_all_css.patch @@ -0,0 +1,12 @@ +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 diff --git a/kdelibs.spec b/kdelibs.spec index ab709dd..23202e7 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -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 - 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 - 4.3.85-7 - PolkitQt rebuild diff --git a/sources b/sources index 4e109ba..371fa86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4bf066d2f489d7d00263ac5a8e787c23 kdelibs-4.3.85.tar.bz2 +45c42bfcaa5a968a38e20a0599c4e8e9 kdelibs-4.3.90.tar.bz2