packages (DEVEL): gtk-webkit/gtk-webkit.spec - merged HEAD

[pawelz]

Author: pawelz                       Date: Wed Jul 14 12:40:42 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- merged HEAD

---- Files affected:
packages/gtk-webkit:
   gtk-webkit.spec (1.86.2.4 -> 1.86.2.5) 

---- Diffs:

================================================================
Index: packages/gtk-webkit/gtk-webkit.spec
diff -u packages/gtk-webkit/gtk-webkit.spec:1.86.2.4 packages/gtk-webkit/gtk-webkit.spec:1.86.2.5
--- packages/gtk-webkit/gtk-webkit.spec:1.86.2.4	Fri Jul  2 16:17:33 2010
+++ packages/gtk-webkit/gtk-webkit.spec	Wed Jul 14 14:40:37 2010
@@ -1,5 +1,9 @@
 # $Revision$, $Date$
 # TODO: optflags
+#
+# Conditional build:
+%bcond_without	introspection	# disable introspection
+
 Summary:	Port of WebKit embeddable web component to GTK+
 Summary(pl.UTF-8):	Port osadzalnego komponentu WWW WebKit do GTK+
 Name:		gtk-webkit
@@ -16,17 +20,18 @@
 BuildRequires:	enchant-devel >= 0.22
 BuildRequires:	flex >= 2.5.33
 BuildRequires:	fontconfig-devel >= 2.4.0
+BuildRequires:	geoclue-devel
 BuildRequires:	gettext-devel
-BuildRequires:	gir-repository-devel
+%{?with_introspection:BuildRequires:	gir-repository-devel}
 BuildRequires:	glib2-devel >= 1:2.22.0
 BuildRequires:	glibc-misc
-BuildRequires:	gobject-introspection-devel >= 0.6.15
+%{?with_introspection:BuildRequires:	gobject-introspection-devel >= 0.6.2}
 BuildRequires:	gperf
 BuildRequires:	gstreamer-devel >= 0.10
 BuildRequires:	gstreamer-plugins-base-devel >= 0.10.25
 BuildRequires:	gtk+2-devel >= 2:2.20.0
 BuildRequires:	gtk-doc >= 1.10
-BuildRequires:	libicu-devel
+BuildRequires:	libicu-devel >= 4.2.1
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libsoup-devel >= 2.30.0
@@ -40,7 +45,7 @@
 BuildRequires:	xorg-lib-libXt-devel
 Requires:	gtk+2 >= 2:2.20.0
 Requires:	libsoup >= 2.30.0
-Conflicts:	gir-repository < 0.6.5-7
+%{?with_introspection:Conflicts:	gir-repository < 0.6.5-7}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -70,6 +75,10 @@
 
 %prep
 %setup -q -n webkit-%{version}
+%patch0 -p2
+
+# http://trac.webkit.org/browser/trunk/WebKit/gtk/JSCore.gir.in
+%{__sed} -i -e 's,repository version="1.0",repository version="1.1",' WebKit/gtk/JSCore-1.0.gir
 
 %build
 %{__gtkdocize}
@@ -80,10 +89,13 @@
 %{__autoconf}
 %configure \
 	--disable-silent-rules \
+	--enable-3D-transforms \
 	--enable-dom-storage \
+	--enable-geolocation \
 	--enable-icon-database \
-	--enable-introspection \
+	--%{!?with_introspection:dis}%{?with_introspection:en}able-introspection \
 	--enable-video
+
 %{__make}
 
 %install
@@ -105,8 +117,10 @@
 %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.2
+%if %{with introspection}
 %{_libdir}/girepository-1.0/JSCore-1.0.typelib
 %{_libdir}/girepository-1.0/WebKit-1.0.typelib
+%endif
 %dir %{_datadir}/webkit-1.0
 %{_datadir}/webkit-1.0/images
 %{_datadir}/webkit-1.0/resources
@@ -116,8 +130,10 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libwebkit-1.0.so
 %{_libdir}/libwebkit-1.0.la
+%if %{with introspection}
 %{_datadir}/gir-1.0/JSCore-1.0.gir
 %{_datadir}/gir-1.0/WebKit-1.0.gir
+%endif
 %{_includedir}/webkit-1.0
 %{_pkgconfigdir}/webkit-1.0.pc
 
@@ -127,6 +143,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.86.2.5  2010/07/14 12:40:37  pawelz
+- merged HEAD
+
 Revision 1.86.2.4  2010/07/02 14:17:33  pawelz
 - BR: gobject-introspection-devel >= 0.6.15 (not released yet)
 
@@ -139,6 +158,36 @@
 Revision 1.86.2.1  2010/05/27 21:33:05  pawelz
 - up to 1.3.1
 - not tested yet
+
+Revision 1.95  2010/07/14 12:32:33  glen
+- fix gir file, thx patrys
+
+Revision 1.94  2010/07/13 14:24:12  glen
+- introspection bcond
+
+Revision 1.93  2010/07/13 09:50:54  pawelz
+- up to 1.2.2
+
+Revision 1.92  2010/07/13 09:28:01  patrys
+- rebuild with latest gir
+- rel 6
+
+Revision 1.91  2010/07/13 08:17:49  glen
+- release 5
+
+Revision 1.90  2010/07/01 16:48:38  patrys
+- more features, updated deps
+
+Revision 1.89  2010/06/30 21:00:02  shadzik
+- add -icu44.patch
+- rel 4
+- updated libicu BR
+
+Revision 1.88  2010/06/30 19:13:07  shadzik
+- rel 3
+
+Revision 1.87  2010/06/15 08:39:48  hawk
+- release 2
 
 Revision 1.86  2010/05/15 23:24:43  sparky
 - BR: glibc-misc (ldd used by libtool)
================================================================

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