rpms/WebKit/devel .cvsignore, 1.5, 1.6 WebKit.spec, 1.8, 1.9 sources, 1.5, 1.6

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

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 hopely fix bug 444445
- Modify the process of building GTK+ port a bit



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/WebKit/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Apr 2008 23:53:13 -0000	1.5
+++ .cvsignore	28 Apr 2008 17:38:27 -0000	1.6
@@ -1 +1 @@
-WebKit-r31787.tar.bz2
+WebKit-r32531.tar.bz2


Index: WebKit.spec
===================================================================
RCS file: /cvs/extras/rpms/WebKit/devel/WebKit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WebKit.spec	12 Apr 2008 23:53:13 -0000	1.8
+++ WebKit.spec	28 Apr 2008 17:38:27 -0000	1.9
@@ -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
@@ -16,8 +16,6 @@
 
 Source0:	http://nightly.webkit.org/files/trunk/src/WebKit-r%{svn_revision}.tar.bz2
 
-Patch0: 	%{name}-gcc43.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	bison
@@ -96,8 +94,6 @@
 
 %prep
 %setup -qn "%{name}-r%{svn_revision}"
-%patch0 -b .gcc43
-
 
 %build
 ## We don't like pre-built binaries, especially ones for other OSes. =)
@@ -106,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
 
 
@@ -130,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}
 
 
 
@@ -225,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 hopely 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
@@ -271,4 +280,4 @@
 - Add various AUTHORS, README, and LICENSE files (via the doc subpackage). 
 
 * Tue Dec 04 2007 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.1.svn28383
-- Initial packaging for Fedora.
\ No newline at end of file
+- Initial packaging for Fedora.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/WebKit/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Apr 2008 23:53:13 -0000	1.5
+++ sources	28 Apr 2008 17:38:27 -0000	1.6
@@ -1 +1 @@
-786a8fc7c9fd8755c8c75e93ae4b7bc2  WebKit-r31787.tar.bz2
+db45e1fab555d2a739d4e01f7dfc0091  WebKit-r32531.tar.bz2