rpms/webkitkde/devel webkitkde-svn1079265.patch, NONE, 1.1 webkitkde.spec, 1.13, 1.14

[nucleo]

Author: nucleo

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

Modified Files:
	webkitkde.spec 
Added Files:
	webkitkde-svn1079265.patch 
Log Message:
Fixed the library and header file names

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: webkitkde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/devel/webkitkde.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- webkitkde.spec	23 Jan 2010 18:49:30 -0000	1.13
+++ webkitkde.spec	24 Jan 2010 00:31:24 -0000	1.14
@@ -3,12 +3,12 @@
 %if 0%{?fedora} < 13
 %define kde43 1
 %else
-%define kde_version 4.3.80
+%define kde_version 4.3.95
 %endif
 
 Name:             webkitkde
 Version:          0.0.4
-Release:          0.1.svn1078162%{?dist}
+Release:          0.2.svn1079265%{?dist}
 Summary:          QtWebKit bindings to KDE
 Group:            System Environment/Libraries
 License:          LGPLv2+
@@ -25,12 +25,13 @@ URL:              http://techbase.kde.or
 # mainmodule   = playground
 # submodule    = libs
 # kde_release  = no
-# version      = 0.0.3-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-svn1079265.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    cmake gettext
 BuildRequires:    kdelibs4-devel %{?kde_version: >= %{kde_version}}
@@ -77,6 +78,7 @@ Development files for the webkitpart.
 
 %prep
 %setup -q -n %{name}-%{version}-svn
+%patch0 -p4
 
 %build
 mkdir -p %{_target_platform}
@@ -157,6 +159,9 @@ fi
 %{_kde4_appsdir}/cmake/modules/FindWebKitPart.cmake
 
 %changelog
+* 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