SPECS: gtk-webkit.spec - merged from DEVEL

[patrys]

Author: patrys                       Date: Tue Mar 17 13:35:02 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   gtk-webkit.spec (1.53 -> 1.54) 

---- Diffs:

================================================================
Index: SPECS/gtk-webkit.spec
diff -u SPECS/gtk-webkit.spec:1.53 SPECS/gtk-webkit.spec:1.54
--- SPECS/gtk-webkit.spec:1.53	Sun Feb  8 23:14:02 2009
+++ SPECS/gtk-webkit.spec	Tue Mar 17 14:34:56 2009
@@ -1,15 +1,14 @@
 # $Revision$, $Date$
 # TODO: optflags
-%define snap	r40023
 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.3
-Release:	0.%{snap}.1
+Version:	1.1.1
+Release:	1
 License:	BSD-like
 Group:		X11/Libraries
-Source0:	http://builds.nightly.webkit.org/files/trunk/src/WebKit-%{snap}.tar.bz2
-# Source0-md5:	e5e77fb965c17e1bd9c537f86928f277
+Source0:	http://cafe.minaslivre.org/webkit/webkit-%{version}.tar.gz
+# Source0-md5:	d3a5d7233beab310e9d3e5568fae49a1
 URL:		http://www.webkit.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -25,6 +24,7 @@
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	librsvg-devel >= 2.2.0
+BuildRequires:	libsoup-devel >= 2.26.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	libxslt-devel
@@ -60,10 +60,10 @@
 Pliki programistyczne webkit.
 
 %prep
-%setup -q -n WebKit-%{snap}
+%setup -q -n webkit-%{version}
 
 %build
-%{__aclocal}
+%{__aclocal} -I autotools
 %{__libtoolize}
 %{__autoheader}
 %{__automake}
@@ -73,8 +73,7 @@
 	--enable-icon-database \
 	--enable-svg-experimental \
 	--enable-svg-filters \
-	--enable-video \
-	--with-font-backend=pango
+	--enable-video
 %{__make}
 
 %install
@@ -93,7 +92,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/jsc
 %attr(755,root,root) %{_libdir}/libwebkit-1.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwebkit-1.0.so.1
+%attr(755,root,root) %ghost %{_libdir}/libwebkit-1.0.so.2
 %dir %{_datadir}/webkit-1.0
 %{_datadir}/webkit-1.0/webinspector
 
@@ -110,6 +109,17 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2009/03/17 13:34:56  patrys
+- merged from DEVEL
+
+Revision 1.53.2.2  2009/03/08 16:59:03  patrys
+- fix packaging
+- use freetype backend as pango backend is obsolete
+
+Revision 1.53.2.1  2009/03/02 17:13:19  patrys
+- 1.1.1 stable
+- requires new libsoup so it has to wait on DEVEL
+
 Revision 1.53  2009/02/08 22:14:02  megabajt
 - added CVE reference
 
================================================================

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