rpms/WebKit/devel WebKit.spec,1.4,1.5

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/pkgs/rpms/WebKit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8979

Modified Files:
	WebKit.spec 
Log Message:
Fix bugs 435561 (case-sensitive header filename mismatch) and 433138 (gtk-devel subpackage should not depend on qt4-devel).


Index: WebKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/devel/WebKit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WebKit.spec	1 Mar 2008 08:07:18 -0000	1.4
+++ WebKit.spec	2 Mar 2008 09:29:19 -0000	1.5
@@ -7,7 +7,7 @@
 
 Name:		WebKit
 Version:	1.0.0
-Release:	0.5.svn%{svn_revision}%{?dist}
+Release:	0.6.svn%{svn_revision}%{?dist}
 Summary:	Web content engine library
 
 Group:		Development/Libraries
@@ -50,8 +50,6 @@
 Requires:	%{name}-gtk = %{version}-%{release}
 Requires:	pkgconfig
 Requires:	gtk2-devel
-## Uses qmake, so needs the Qt4 development stuff too.
-Requires:	qt4-devel
 
 %description	gtk-devel
 The %{name}-gtk-devel package contains libraries, build data, and header
@@ -117,7 +115,7 @@
 		VERSION=%{version}			\
 		CONFIG-=qt				\
 		CONFIG+=gtk-port			\
-		WEBKIT_INC_DIR=%{_includedir}/WebKit	\
+		WEBKIT_INC_DIR=%{_includedir}/webkit	\
 		WEBKIT_LIB_DIR=%{_libdir}		\
 		../WebKit.pro
 	make %{?_smp_mflags}
@@ -136,7 +134,6 @@
 		VERSION=%{version}			\
 		CONFIG-=gtk				\
 		CONFIG+=qt-port				\
-		WEBKIT_INC_DIR=%{_includedir}/WebKit	\
 		WEBKIT_LIB_DIR=%{_libdir}		\
 		../WebKit.pro
 	make %{?_smp_mflags}
@@ -206,8 +203,10 @@
 
 %files	gtk-devel
 %defattr(-,root,root,-)
-%{_includedir}/WebKit
-%{_libdir}/libWebKitGtk.prl
+## The .prl file stores information only on how the library was built, and is
+## not needed for linking. 
+%exclude %{_libdir}/libWebKitGtk.prl
+%{_includedir}/webkit
 %{_libdir}/libWebKitGtk.so
 %{_libdir}/pkgconfig/WebKitGtk.pc
 
@@ -232,6 +231,12 @@
 
 
 %changelog
+* Sat Mar 01 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.6.svn30667
+- Fix include directory naming. Resolves: bug 435561 (Header file <> header
+  file location mismatch)
+- Remove qt4-devel runtime dependency and .prl file from WebKit-gtk-devel.
+  Resolves: bug 433138 (WebKit-gtk-devel has a requirement on qt4-devel) 
+
 * Fri Feb 29 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.5.svn30667
 - Update to new upstream snapshot (SVN 30667)
 - Add some build fixes for GCC 4.3: