rpms/kdenetwork/F-12 kdenetwork-4.3.4-webkitkde.patch, NONE, 1.1 .cvsignore, 1.74, 1.75 kdenetwork.spec, 1.206, 1.207 sources, 1.80, 1.81

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kdenetwork/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28961

Modified Files:
	.cvsignore kdenetwork.spec sources 
Added Files:
	kdenetwork-4.3.4-webkitkde.patch 
Log Message:
KDE 4.3.3


kdenetwork-4.3.4-webkitkde.patch:
 CMakeLists.txt   |    2 --
 kget_plug_in.cpp |    6 +-----
 2 files changed, 1 insertion(+), 7 deletions(-)

--- NEW FILE kdenetwork-4.3.4-webkitkde.patch ---
Index: kget/extensions/konqueror/kget_plug_in.cpp
===================================================================
--- kget/extensions/konqueror/kget_plug_in.cpp	(revision 1046122)
+++ kget/extensions/konqueror/kget_plug_in.cpp	(revision 1046123)
@@ -33,11 +33,7 @@
 
 #ifdef HAVE_WEBKITKDE
 #include <webkitpart.h>
-#ifdef HAVE_WEBVIEW
-#include <webview.h>
-#else
-#include <webkitview.h>
-#endif
+#include <QWebView>
 #include <QWebFrame>
 #endif
 
Index: kget/extensions/konqueror/CMakeLists.txt
===================================================================
--- kget/extensions/konqueror/CMakeLists.txt	(revision 1046122)
+++ kget/extensions/konqueror/CMakeLists.txt	(revision 1046123)
@@ -18,8 +18,6 @@
     add_definitions(-DHAVE_WEBKITKDE)
     include_directories(${KDEWEBKIT_INCLUDE_DIR})
     include_directories(${WEBKITPART_INCLUDE_DIR})
-    FIND_PATH(WEBVIEW_PATH webkitkde/webview.h PATH ${KDEWEBKIT_INCLUDE_DIR})
-    macro_bool_to_01(WEBVIEW_PATH HAVE_WEBVIEW )
     set(WEBKITKDE_FOUND true)
 endif( KDEWEBKIT_FOUND AND WEBKITPART_FOUND )
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-12/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- .cvsignore	7 Oct 2009 11:32:25 -0000	1.74
+++ .cvsignore	10 Nov 2009 15:15:45 -0000	1.75
@@ -1,2 +1,2 @@
 krdc-icons.tar.bz2
-kdenetwork-4.3.2.tar.bz2
+kdenetwork-4.3.3.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-12/kdenetwork.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- kdenetwork.spec	6 Nov 2009 13:09:21 -0000	1.206
+++ kdenetwork.spec	10 Nov 2009 15:15:46 -0000	1.207
@@ -1,8 +1,9 @@
+
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.3.2
-Release: 6%{?dist}
+Version: 4.3.3
+Release: 4%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -14,6 +15,7 @@ Source1: krdc-icons.tar.bz2
 Patch1: kdenetwork-4.2.98-kdrc-icon.patch
 
 # upstream patches (4.3 branch):
+Patch100: kdenetwork-4.3.4-webkitkde.patch
 
 # upstream patches (4.4 branch):
 Patch200: kdenetwork-4.3.0-jabber-kde#111537.patch
@@ -22,10 +24,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 %if 0%{?fedora}
 BuildRequires: avahi-compat-libdns_sd-devel
-BuildRequires: webkitpart-devel
-BuildRequires: libgadu-devel >= 1.8.0
-BuildRequires: openslp-devel
-BuildRequires: libotr-devel
+BuildRequires: webkitpart-devel >= 0.0.2
 %endif
 BuildRequires: boost-devel
 # FIXME/TODO
@@ -35,12 +34,15 @@ BuildRequires: glib2-devel
 BuildRequires: gmp-devel
 BuildRequires: kdelibs-experimental-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
+BuildRequires: libgadu-devel >= 1.8.0
 BuildRequires: libidn-devel
 BuildRequires: libmsn-devel >= 4.0-0.4.beta2
+BuildRequires: libotr-devel
 BuildRequires: libvncserver-devel
 BuildRequires: libxslt-devel libxml2-devel
 BuildRequires: meanwhile-devel
 BuildRequires: openldap-devel
+BuildRequires: openslp-devel
 BuildRequires: ortp-devel
 BuildRequires: pcre-devel
 BuildRequires: qca2-devel
@@ -101,6 +103,7 @@ Requires: kdelibs4-devel
 
 # 4.3 upstream patches
 chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
+%patch100 -p0 -b .webkitkde
 
 # 4.4 upstream patches
 %patch200 -p0 -b .bz#515586-kopete
@@ -193,11 +196,17 @@ fi
 
 
 %changelog
-* Fri Nov 06 2009 Than Ngo <than at redhat.com> - 4.3.2-6
-- rhel cleanup, drop BR on libotr, openslp
+* Mon Nov 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-4
+- BR: webkitpart-devel >= 0.0.2
+
+* Mon Nov  9 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.3-3
+- Compile with latest WebKitKDE
+
+* Tue Nov 03 2009 Than Ngo <than at redhat.com> - 4.3.3-2
+- respin
 
-* Thu Nov 05 2009 Than Ngo <than at redhat.com> - 4.3.2-5
-- rhel cleanup, drop BR on libgadu
+* Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
+- 4.3.3
 
 * Mon Oct 26 2009 Than Ngo <than at redhat.com> - 4.3.2-4
 - rhel cleanup


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-12/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- sources	7 Oct 2009 11:32:26 -0000	1.80
+++ sources	10 Nov 2009 15:15:46 -0000	1.81
@@ -1,2 +1,2 @@
 7dd360a790100c952090410c2c89937c  krdc-icons.tar.bz2
-57b44a9b59c35366a0c287c591bb9bdc  kdenetwork-4.3.2.tar.bz2
+bb9a20da6e18a4952f7001b581aa9a1d  kdenetwork-4.3.3.tar.bz2