rpms/webkitkde/F-11 webkitkde-svn1079265.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 webkitkde.spec, 1.4, 1.5 webkitkde-remove-kdelauncher.patch, 1.1, NONE

[nucleo]

Author: nucleo

Update of /cvs/pkgs/rpms/webkitkde/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17073

Modified Files:
	.cvsignore sources webkitkde.spec 
Added Files:
	webkitkde-svn1079265.patch 
Removed Files:
	webkitkde-remove-kdelauncher.patch 
Log Message:
build only for kdelibs >= 4.4.0

webkitkde-svn1079265.patch:
 FindWebKitPart.cmake |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

--- NEW FILE webkitkde-svn1079265.patch ---
--- trunk/playground/libs/webkitkde/part/cmake/modules/FindWebKitPart.cmake	2009/11/24 06:55:18	1053443
+++ trunk/playground/libs/webkitkde/part/cmake/modules/FindWebKitPart.cmake	2010/01/23 23:12:51	1079265
@@ -5,10 +5,9 @@
 #  WEBKITPART_INCLUDE_DIR - the WebKitPart include directory
 #  WEBKITPART_LIBRARIES - Link these to use WebKitPart
 #  WEBKITPART_DEFINITIONS - Compiler switches required for using WebKitPart
+#
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
 
 if ( WEBKITPART_INCLUDE_DIR AND WEBKITPART_LIBRARIES )
    # in cache already
@@ -17,7 +16,7 @@
 
 # Little trick I found in FindKDE4Interal... If we're building WebKitPart, set the variables to point to the build directory.
 if(webkitpart_SOURCE_DIR)
-    set(WEBKITPART_LIBRARIES webkitkpart)
+    set(WEBKITPART_LIBRARIES kwebkitpart)
     set(WEBKITPART_INCLUDE_DIR ${CMAKE_SOURCE_DIR})
 endif(webkitpart_SOURCE_DIR)
 
@@ -25,18 +24,15 @@
 # in the FIND_PATH() and FIND_LIBRARY() calls
 if( NOT WIN32 )
   find_package(PkgConfig)
-
   pkg_check_modules(PC_WEBKITPART kwebkitpart)
-
   set(PCRE_DEFINITIONS ${PC_WEBKITPART_CFLAGS_OTHER})
 endif( NOT WIN32 )
 
-FIND_PATH(WEBKITPART_INCLUDE_DIR NAMES webkitpart.h
+FIND_PATH(WEBKITPART_INCLUDE_DIR NAMES kwebkitpart.h
   PATHS
   ${PC_WEBKITPART_INCLUDEDIR} 
   ${PC_WEBKITPART_INCLUDE_DIRS}
   ${KDE4_INCLUDE_INSTALL_DIR}
-  PATH_SUFFIXES webkitkde
 )
 
 FIND_LIBRARY(WEBKITPART_LIBRARIES NAMES kwebkit
@@ -51,4 +47,3 @@
 
 # show the WEBKITPART_INCLUDE_DIR and WEBKITPART_LIBRARIES variables only in the advanced view
 MARK_AS_ADVANCED(WEBKITPART_INCLUDE_DIR WEBKITPART_LIBRARIES)
-


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	9 Nov 2009 15:53:52 -0000	1.3
+++ .cvsignore	10 Feb 2010 14:58:51 -0000	1.4
@@ -1 +1 @@
-webkitkde-0.0.2-svn.tar.bz2
+webkitkde-0.0.4-svn.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Nov 2009 15:53:52 -0000	1.4
+++ sources	10 Feb 2010 14:58:52 -0000	1.5
@@ -1 +1 @@
-a4a7e6bb355a15a21f2949986567e3c1  webkitkde-0.0.2-svn.tar.bz2
+3c375f8e4255c6c168e0a8f629a41d09  webkitkde-0.0.4-svn.tar.bz2


Index: webkitkde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/F-11/webkitkde.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- webkitkde.spec	9 Nov 2009 15:53:52 -0000	1.4
+++ webkitkde.spec	10 Feb 2010 14:58:52 -0000	1.5
@@ -1,6 +1,6 @@
 Name:             webkitkde
-Version:          0.0.2
-Release:          0.1.20091109svn%{?dist}
+Version:          0.0.4
+Release:          0.3.svn1079265%{?dist}
 Summary:          QtWebKit bindings to KDE
 Group:            System Environment/Libraries
 License:          LGPLv2+
@@ -17,16 +17,17 @@ URL:              http://techbase.kde.or
 # mainmodule   = playground
 # submodule    = libs
 # kde_release  = no
-# version      = 0.0.2-svn
+# version      = 0.0.4-svn
 # docs         = no
 #
 # To create a new checkout use it with anonymous svn access
 # ./create_tarball.rb -n -a webkitkde
 Source0:          %{name}-%{version}-svn.tar.bz2
-Patch0:           webkitkde-remove-kdelauncher.patch
+Patch0:           webkitkde-svn1079265.patch
+Patch1:           webkitkde-remove-kdelauncher.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    cmake gettext
-BuildRequires:    kdelibs4-devel
+BuildRequires:    kdelibs4-devel >= 4.4.0
 
 %description
 This project aims to integrate WebKit (QtWebKit) into KDE.
@@ -36,18 +37,11 @@ The project is made up of the following 
 The WebKitKDE library sits on top of QtWebKit, providing
 KDE integration (for example, WebActions using KDE icons
 and shortcuts, downloading using KIO, etc).
-%package devel
-Summary:          Development files for %{name}
-Group:            Development/Libraries
-Requires:         kdelibs4-devel
-Requires:         %{name} = %{version}-%{release}
-
-%description devel
-Development files for the %{name}.
 
 %package -n webkitpart
 Summary:          A KPart based on WebKitKDE library
 Group:            System Environment/Libraries
+Requires:         %{name} = %{version}-%{release}
 %description -n webkitpart
 WebKitPart is a KPart that allows KPart-based applications,
 for example Konqueror, to make use of WebKit for viewing
@@ -56,14 +50,15 @@ web pages.
 %package -n webkitpart-devel
 Summary:          Development files for webkitpart
 Group:            Development/Libraries
-Requires:         %{name}-devel = %{version}-%{release}
+Requires:         kdelibs4-devel
 Requires:         webkitpart = %{version}-%{release}
 %description -n webkitpart-devel
 Development files for the webkitpart.
 
 %prep
 %setup -q -n %{name}-%{version}-svn
-%patch0 -p1
+%patch0 -p4
+%patch1 -p1
 
 %build
 mkdir -p %{_target_platform}
@@ -77,17 +72,13 @@ make %{?_smp_mflags} -C %{_target_platfo
 rm -rf $RPM_BUILD_ROOT
 
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
-mkdir $RPM_BUILD_ROOT%{_kde4_appsdir}/webkitpart/kpartplugins
+#mkdir $RPM_BUILD_ROOT%{_kde4_appsdir}/webkitpart/kpartplugins
 
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
 %post -n webkitpart
 /sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
@@ -105,34 +96,45 @@ fi
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README COPYING.LIB
-%{_kde4_libdir}/libkdewebkit.so.*
-
-%files devel
-%defattr(-,root,root,-)
-%doc README
-%{_kde4_includedir}/KDE/KdeWebKit
-%{_kde4_includedir}/kdewebkit
-%{_kde4_libdir}/libkdewebkit.so
-%{_kde4_appsdir}/cmake/modules/FindKdeWebKit.cmake
 
 %files -n webkitpart
 %defattr(-,root,root,-)
 %doc README COPYING.LIB
-%{_kde4_libdir}/kde4/webkitkdepart.so
-%{_kde4_libdir}/libwebkitkde.so.*
+%{_kde4_libdir}/kde4/kwebkitpart.so*
+%{_kde4_libdir}/libkwebkit.so.*
 %{_kde4_iconsdir}/hicolor/*/apps/webkit.png
-%{_kde4_appsdir}/webkitpart
-%{_kde4_datadir}/kde4/services/webkitpart.desktop
+%{_kde4_appsdir}/kwebkitpart
+%{_kde4_datadir}/kde4/services/kwebkitpart.desktop
 
 %files -n webkitpart-devel
 %defattr(-,root,root,-)
 %doc README
-%{_kde4_includedir}/KDE/WebKitPart
-%{_kde4_includedir}/webkitkde
-%{_kde4_libdir}/libwebkitkde.so
+%{_kde4_includedir}/KDE/KWebKitPart
+%{_kde4_includedir}/kwebkitpart.h
+%{_kde4_includedir}/kwebkit_export.h
+%{_kde4_libdir}/libkwebkit.so
 %{_kde4_appsdir}/cmake/modules/FindWebKitPart.cmake
 
 %changelog
+* Wed Feb 10 2010 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.4-0.3.svn1079265
+- build only for kdelibs >= 4.4.0
+
+* Sun Jan 24 2010 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.4-0.2.svn1079265
+- svn 1079265. Fixed the library and header file names.
+
+* Sat Jan 23 2010 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.4-0.1.svn1078162
+- svn 1078162
+
+* Thu Dec  3 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.3-0.2.svn1057318
+- svn 1057318
+
+* Tue Nov 24 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.3-0.1.svn1049337
+- version changed to 0.0.3 (kdewebkit moved to kdelibs 4.4)
+- drop webkitkde-devel subpackage for KDE 4.4
+
+* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.0.2-0.2.20091109svn
+- rebuild (qt-4.6.0-rc1, fc13+)
+
 * Mon Nov  9 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.2-0.1.20091109svn
 - version changed to 0.0.2 for new API
 


--- webkitkde-remove-kdelauncher.patch DELETED ---