From 479212f23ff166217a81c86702298dde7d59e6c9 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Fri, 7 Mar 2008 20:57:11 +0000
Subject: [PATCH] * Fri Mar 07 2008 Rex Dieter <rdieter@fedoraproject.org>
 4.0.2-8 - touchup KDE_DISTRIBUTION_TEXT - add Fedora/V-R to KHTML UA string
 (thanks caillon)

---
 kdelibs-4.0.2-branding.patch | 12 ++++++++++++
 kdelibs.spec                 | 12 ++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 kdelibs-4.0.2-branding.patch

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.spec b/kdelibs.spec
index 9ac598c..cf8f332 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -3,7 +3,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -63,6 +63,8 @@ Patch7: kdelibs-4.0.1-dcop-servicetype.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
+# add Fedora/V-R to KHTML UA string
+Patch9: kdelibs-4.0.2-branding.patch
 
 # upstream patches
 Patch100: kdelibs-4.0.x-kio.patch
@@ -174,6 +176,8 @@ format for easy browsing.
 %endif
 %patch7 -p1 -b .dcop-servicetype
 %patch8 -p1 -b .all-css
+%patch9 -p1 -b .branding
+sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
 
 # upstream patches
 %patch100 -p1 -b .kio
@@ -182,7 +186,7 @@ format for easy browsing.
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform} 
-%{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="Fedora package %{name}-%{version}-%{release}" ..
+%{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
@@ -328,6 +332,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Mar 07 2008 Rex Dieter <rdieter@fedoraproject.org> 4.0.2-8
+- touchup KDE_DISTRIBUTION_TEXT
+- add Fedora/V-R to KHTML UA string (thanks caillon)
+
 * Thu Mar 06 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.0.2-7
 - exclude apidocs from the main package