rpms/WebKit/F-8 .cvsignore, 1.4, 1.5 WebKit.spec, 1.3, 1.4 sources, 1.4, 1.5

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/WebKit/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10169

Modified Files:
	.cvsignore WebKit.spec sources 
Log Message:
* 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
- Modify the process of building GTK+ port a bit



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/WebKit/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Apr 2008 07:33:11 -0000	1.4
+++ .cvsignore	30 Apr 2008 15:25:03 -0000	1.5
@@ -1 +1 @@
-WebKit-r31787.tar.bz2
+WebKit-r32531.tar.bz2


Index: WebKit.spec
===================================================================
RCS file: /cvs/extras/rpms/WebKit/F-8/WebKit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WebKit.spec	13 Apr 2008 07:33:11 -0000	1.3
+++ WebKit.spec	30 Apr 2008 15:25:03 -0000	1.4
@@ -3,11 +3,11 @@
 	cp -p %1  %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') \
 	echo %%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') >> docfiles.list
 
-%define		svn_revision	31787
+%define		svn_revision	32531
 
 Name:		WebKit
 Version:	1.0.0
-Release:	0.8.svn%{svn_revision}%{?dist}
+Release:	0.9.svn%{svn_revision}%{?dist}
 Summary:	Web content engine library
 
 Group:		Development/Libraries
@@ -51,8 +51,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
@@ -97,7 +95,6 @@
 %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/}
@@ -105,13 +102,17 @@
 ## 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
-cp -a $(echo * | sed -e 's/build-gtk //') build-gtk
 pushd build-gtk
-	./autogen.sh
+	../autogen.sh
+        ln -sf ../configure
 	%configure --with-font-backend=pango --enable-icon-database
-	make %{?_smp_mflags}
+	make %{?_smp_mflags} -k || status=1
 popd
 
 
@@ -129,16 +130,20 @@
 		CONFIG+=qt-port				\
 		WEBKIT_LIB_DIR=%{_libdir}		\
 		../WebKit.pro
-	make %{?_smp_mflags}
+	make %{?_smp_mflags} -k \
+		|| status=$((status+10))
 popd
 
+echo $status
+if [ $status -gt 0 ] ; then exit 1 ; fi
+
 
 %install
 rm -rf %{buildroot}
 
 make -C build-gtk install DESTDIR=%{buildroot}
 install -d -m 755 %{buildroot}%{_libexecdir}/%{name}
-install -m 755 build-gtk/Programs/GtkLauncher %{buildroot}%{_libexecdir}/%{name}
+install -m 755 build-gtk/Programs/.libs/GtkLauncher %{buildroot}%{_libexecdir}/%{name}
 
 
 
@@ -224,6 +229,11 @@
 
 
 %changelog
+* 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
+- Modify the process of building GTK+ port a bit
+
 * Sat Apr 12 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.8.svn31787
 - Update to new upstream snapshot (SVN 31787).
 - Resolves: CVE-2008-1010 (bug 438532: Arbitrary code execution) and


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/WebKit/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Apr 2008 07:33:11 -0000	1.4
+++ sources	30 Apr 2008 15:25:03 -0000	1.5
@@ -1 +1 @@
-786a8fc7c9fd8755c8c75e93ae4b7bc2  WebKit-r31787.tar.bz2
+db45e1fab555d2a739d4e01f7dfc0091  WebKit-r32531.tar.bz2