SPECS: gtk-webkit.spec - current snap - use GNOME build path inste...

[patrys]

Author: patrys                       Date: Fri Feb  8 16:28:32 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- current snap
- use GNOME build path instead of qmake

---- Files affected:
SPECS:
   gtk-webkit.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/gtk-webkit.spec
diff -u SPECS/gtk-webkit.spec:1.20 SPECS/gtk-webkit.spec:1.21
--- SPECS/gtk-webkit.spec:1.20	Thu Feb  7 23:41:21 2008
+++ SPECS/gtk-webkit.spec	Fri Feb  8 17:28:26 2008
@@ -1,15 +1,15 @@
 # $Revision$, $Date$
 # TODO: optflags
-%define snap	r30053
+%define snap	r30090
 Summary:	Port of WebKit embeddable web component to GTK+
 Summary(pl.UTF-8):	Port osadzalnego komponentu WWW WebKit do GTK+
 Name:		gtk-webkit
 Version:	1.0.0
-Release:	0.%{snap}.2
+Release:	0.%{snap}.1
 License:	BSD-like
 Group:		X11/Libraries
 Source0:	http://nightly.webkit.org/files/trunk/src/WebKit-%{snap}.tar.bz2
-# Source0-md5:	96fa8c968ded68a4934ee9c1afac8a35
+# Source0-md5:	958bf8ce192b544da817c116408cb934
 URL:		http://www.webkit.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -26,7 +26,6 @@
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	libxslt-devel
 BuildRequires:	pkgconfig
-BuildRequires:	qt4-qmake >= 4.3.3-3
 BuildRequires:	sqlite3-devel
 BuildRequires:	xorg-lib-libXft-devel >= 2.0.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -58,16 +57,19 @@
 %setup -q -n WebKit-%{snap}
 
 %build
-WebKitTools/Scripts/build-webkit --gtk \
-	--qmakearg=WEBKIT_INC_DIR=%{_includedir}/webkit \
-	--qmakearg=WEBKIT_LIB_DIR=%{_libdir} \
-	--qmake=qmake-qt4
+%{__aclocal}
+%{__libtoolize}
+%{__autoheader}
+%{__automake}
+%{__autoconf}
+%configure
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -C WebKitBuild/Release install \
-	INSTALL_ROOT=$RPM_BUILD_ROOT
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,9 +84,8 @@
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libWebKitGtk.so
-%{_libdir}/libWebKitGtk.prl
-%{_includedir}/webkit
-%{_pkgconfigdir}/WebKitGtk.pc
+%{_includedir}/WebKit
+%{_pkgconfigdir}/webkit-1.0.pc
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -92,6 +93,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2008-02-08 16:28:26  patrys
+- current snap
+- use GNOME build path instead of qmake
+
 Revision 1.20  2008-02-07 22:41:21  patrys
 - actually use the correct include dir
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gtk-webkit.spec?r1=1.20&r2=1.21&f=u