rpms/WebKit/devel WebKit.spec,1.11,1.12

[Peter Gordon (pgordon)]

Author: pgordon

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

Modified Files:
	WebKit.spec 
Log Message:
QtWebKit stuff moving to qt proper. (#442200)


Index: WebKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/devel/WebKit.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- WebKit.spec	29 Apr 2008 05:03:16 -0000	1.11
+++ WebKit.spec	30 Apr 2008 00:56:54 -0000	1.12
@@ -7,7 +7,7 @@
 
 Name:		WebKit
 Version:	1.0.0
-Release:	0.9.svn%{svn_revision}%{?dist}
+Release:	0.10.svn%{svn_revision}%{?dist}
 Summary:	Web content engine library
 
 Group:		Development/Libraries
@@ -28,8 +28,6 @@
 BuildRequires:	libxslt-devel
 BuildRequires:	pango-devel
 BuildRequires:	pcre-devel
-## Necessary for qmake and friends.
-BuildRequires:	qt4-devel
 BuildRequires:	sqlite-devel
 
 %description 
@@ -59,29 +57,6 @@
 only be used as a "preview" rather than a stable platform library.
 
 
-%package	qt
-Summary:	Qt port of WebKit 
-Group:		Development/Libraries
-
-%description	qt
-%{name} is an open-source Web content engine library. This package contains
-the shared libraries for the WebKit Qt port as well as the sample QtLauncher
-tool. 
-
-
-%package	qt-devel
-Summary:	Development files for %{name}
-Group:		Development/Libraries
-Requires:	%{name}-qt = %{version}-%{release}
-Requires:	pkgconfig
-Requires:	qt4-devel
-
-%description	qt-devel
-The %{name}-qt-devel package contains libraries, build data, and header files
-for developing applications that use %{name}-qt, as well as the DumpRenderTree
-tool.
-
-
 %package	doc
 Summary:	Documentation for %{name}
 Group:		Documentation
@@ -95,6 +70,7 @@
 %prep
 %setup -qn "%{name}-r%{svn_revision}"
 
+
 %build
 ## We don't like pre-built binaries, especially ones for other OSes. =)
 rm -r WebKitLibraries/{*.a,win/}
@@ -102,64 +78,19 @@
 ## Fix permissions for the debuginfo generation.
 chmod a-x WebCore/dom/Clipboard.cpp
 
-status=0
-## Build the GTK+ port...
-
 ## Don't call configure automatically
 sed -i.conf -e '$d' autogen.sh
-mkdir build-gtk
-pushd build-gtk
-	../autogen.sh
-        ln -sf ../configure
-	%configure --with-font-backend=pango --enable-icon-database
-	make %{?_smp_mflags} -k || status=1
-popd
-
-
-## ...and the Qt port. 
-install -d build-qt
-pushd build-qt
-	%{_qt4_qmake} -r				\
-		OUTPUT_DIR="$PWD"			\
-		QMAKE_STRIP=/bin/true			\
-		QMAKE_RPATH=				\
-		QMAKE_CFLAGS="%{optflags}"		\
-		QMAKE_CXXFLAGS="%{optflags}"		\
-		VERSION=%{version}			\
-		CONFIG-=gtk				\
-		CONFIG+=qt-port				\
-		WEBKIT_LIB_DIR=%{_libdir}		\
-		../WebKit.pro
-	make %{?_smp_mflags} -k \
-		|| status=$((status+10))
-popd
-
-echo $status
-if [ $status -gt 0 ] ; then exit 1 ; fi
+./autogen.sh
+%configure --with-font-backend=pango --enable-icon-database
+make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
 
-make -C build-gtk install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot}
 install -d -m 755 %{buildroot}%{_libexecdir}/%{name}
-install -m 755 build-gtk/Programs/.libs/GtkLauncher %{buildroot}%{_libexecdir}/%{name}
-
-
-
-make -C build-qt install INSTALL_ROOT=%{buildroot}
-install -m 755 build-qt/bin/QtLauncher %{buildroot}%{_libexecdir}/%{name}
-install -m 755 build-qt/bin/DumpRenderTree %{buildroot}%{_libexecdir}/%{name}
-
-
-## Cleanup the pkgconfig files a bit...
-pushd %{buildroot}%{_libdir}/pkgconfig/
-	for WEBKIT_LIB in QtWebKit; do
-		sed -i -e 's!prefix=.*!prefix=%{_prefix}!' ${WEBKIT_LIB}.pc
-		## We don't need linkage that the WebKit DSOs already ensure.
-		sed -i -e  "s/^Libs:.*$/Libs: -L\${libdir} -l${WEBKIT_LIB}/" ${WEBKIT_LIB}.pc
-	done
-popd
+install -m 755 Programs/.libs/GtkLauncher %{buildroot}%{_libexecdir}/%{name}
 
 ## Finally, copy over and rename the various files for %%doc inclusion.
 rm -f docfiles.list
@@ -189,17 +120,11 @@
 %postun	gtk -p /sbin/ldconfig
 
 
-%post	qt -p /sbin/ldconfig
-
-%postun	qt -p /sbin/ldconfig
-
-
 %files	gtk
 %defattr(-,root,root,-)
 %doc
 %{_libdir}/libwebkit-1.0.so.*
-%dir %{_libexecdir}/WebKit/
-%{_libexecdir}/WebKit/GtkLauncher
+%{_libexecdir}/WebKit/
 
 %files	gtk-devel
 %defattr(-,root,root,-)
@@ -208,29 +133,17 @@
 %{_libdir}/libwebkit-1.0.so
 %{_libdir}/pkgconfig/webkit-1.0.pc
 
-%files	qt
-%defattr(-,root,root,-)
-%{_libdir}/libQtWebKit.so.*
-%dir %{_libexecdir}/WebKit/
-%{_libexecdir}/WebKit/QtLauncher
-
-%files	qt-devel
-%defattr(-,root,root,-)
-%{_includedir}/QtWebKit/
-%{_libdir}/libQtWebKit.prl
-%{_libdir}/libQtWebKit.so
-%{_libdir}/pkgconfig/QtWebKit.pc
-%{_libexecdir}/WebKit/DumpRenderTree
-%if 0%{?fedora} < 10
-%{_qt4_plugindir}/imageformats/libqtwebico.so
-%endif
-%{_qt4_prefix}/mkspecs/features/qtwebkit.prf
-
 %files	doc -f docfiles.list
 %defattr(-,root,root,-)
 
 
 %changelog
+* Tue Apr 29 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.10.svn32531
+- Remove the -Qt subpackage stuff. QtWebKit is now included in Qt proper, as
+  of qt-4.4.0-0.6.rc1. (We no longer need separate build-qt and build-gtk
+  subdirectories either.)
+- Reference: bug 442200 (RFE: WebKit Migration)
+
 * Mon Apr 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.0.0-0.9.svn32531
 - Update to new upstream snapshot (SVN 32531).
 - Fix bug 443048 and hopefully fix bug 444445