SPECS: epiphany.spec - 2.20.0

[patrys]

Author: patrys                       Date: Tue Sep 18 10:36:45 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 2.20.0

---- Files affected:
SPECS:
   epiphany.spec (1.153 -> 1.154) 

---- Diffs:

================================================================
Index: SPECS/epiphany.spec
diff -u SPECS/epiphany.spec:1.153 SPECS/epiphany.spec:1.154
--- SPECS/epiphany.spec:1.153	Sat Sep 15 23:21:35 2007
+++ SPECS/epiphany.spec	Tue Sep 18 12:36:40 2007
@@ -1,20 +1,25 @@
 # $Revision$, $Date$
-%define		basever		2.18
+#
+# TODO:	- review first-tab patch
+#
+#Conditional build:
+%bcond_with	webkit		# Build with experimental webkit suppor instead of xulrunner
+#
+%define		basever		2.19
 Summary:	Epiphany - gecko-based GNOME web browser
 Summary(es.UTF-8):	Epiphany - navigador Web de GNOME basado en gecko
 Summary(pl.UTF-8):	Epiphany - przeglądarka WWW dla GNOME
 Name:		epiphany
-Version:	2.18.3
-Release:	4
+Version:	2.20.0
+Release:	1
 License:	GPL v2
 Group:		X11/Applications/Networking
-Source0:	http://ftp.gnome.org/pub/gnome/sources/epiphany/2.18/%{name}-%{version}.tar.bz2
-# Source0-md5:	2e77f3f0651a27cac29224e82c3cc793
-Patch0:		%{name}-first-tab.patch
-Patch1:		%{name}-desktop.patch
-Patch2:		%{name}-pld-homepage.patch
-Patch3:		%{name}-configure.patch
-Patch4:		%{name}-agent.patch
+Source0:	http://ftp.gnome.org/pub/gnome/sources/epiphany/2.20/%{name}-%{version}.tar.bz2
+# Source0-md5:	651beab72c7a3c0b42b45f5087d4e9b0
+#Patch0:		%{name}-first-tab.patch
+Patch1:		%{name}-pld-homepage.patch
+Patch2:		%{name}-configure.patch
+Patch3:		%{name}-agent.patch
 URL:		http://www.gnome.org/projects/epiphany/
 BuildRequires:	GConf2-devel >= 2.18.0.1
 BuildRequires:	ORBit2-devel >= 1:2.14.7
@@ -27,6 +32,10 @@
 BuildRequires:	gnome-vfs2-devel >= 2.18.0.1
 BuildRequires:	gtk+2-devel >= 2:2.10.14
 BuildRequires:	gtk-doc >= 1.8
+%if %{with webkit}
+BuildRequires:	gtk-webkit-devel
+BuildRequires:	libssh2-devel
+%endif
 BuildRequires:	intltool >= 0.35.5
 BuildRequires:	iso-codes >= 0.53
 BuildRequires:	libglade2-devel >= 1:2.6.0
@@ -41,8 +50,10 @@
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	scrollkeeper
 BuildRequires:	startup-notification-devel >= 0.8
+%if %{without webkit}
 BuildRequires:	xulrunner
-BuildRequires:	xulrunner-devel >= 1.8.0.4
+BuildRequires:	xulrunner-devel >= 1.8.1.6-1.20070731.2
+%endif
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	gtk+2
 Requires(post,postun):	hicolor-icon-theme
@@ -51,14 +62,18 @@
 Requires:	dbus >= 1.0.2
 Requires:	gnome-icon-theme >= 2.18.0
 Requires:	libgnomeui >= 2.18.1
+%if %{without webkit}
 %requires_eq	xulrunner
+%endif
 Obsoletes:	python-epiphany
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%if %{without webkit}
 # can be provided by mozilla or mozilla-embedded
 %define		_noautoreqdep	libgtkembedmoz.so libgtksuperwin.so libxpcom.so
 # we have strict deps for it
 %define		_noautoreq	libxpcom.so
+%endif
 
 %description
 GNOME browser based on Gecko (Mozilla rendering engine).
@@ -103,11 +118,10 @@
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 %{__gnome_doc_prepare}
@@ -122,8 +136,11 @@
 %configure \
 	--disable-schemas-install \
 	--enable-dbus \
-	--enable-gtk-doc \
-	--enable-python \
+	%{?!with_webkit:--enable-gtk-doc} \
+	--enable-network-manager \
+	--enable-python\
+	--enable-spell-checker \
+	%{?with_webkit:--with-engine=webkit} \
 	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
@@ -169,7 +186,7 @@
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/%{name}
 %{_desktopdir}/*.desktop
-%{_iconsdir}/hicolor/*/*/*.png
+%{_iconsdir}/*/*/apps/*.*
 %{_sysconfdir}/gconf/schemas/epiphany-fonts.schemas
 %{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas
 %{_sysconfdir}/gconf/schemas/epiphany-pango.schemas
@@ -178,8 +195,10 @@
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/%{basever}
 %dir %{_libdir}/%{name}/%{basever}/extensions
+%if %{without webkit}
 %dir %{_libdir}/%{name}/%{basever}/plugins
 %attr(755,root,root) %{_libdir}/epiphany/%{basever}/plugins/*.so*
+%endif
 %{_mandir}/man1/*
 
 %files devel
@@ -199,8 +218,24 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.154  2007/09/18 10:36:40  patrys
+- 2.20.0
+
 Revision 1.153  2007/09/15 21:21:35  wiget
 - release 4
+
+Revision 1.152.2.4  2007/09/13 20:32:27  patrys
+- parsing error
+
+Revision 1.152.2.3  2007/09/11 21:10:22  aflinta
+ - added webkit support (experimental)
+ - updated TODO
+
+Revision 1.152.2.2  2007/09/08 20:43:26  qboosh
+- desktop patch is obsolete
+
+Revision 1.152.2.1  2007/09/08 20:31:49  aflinta
+- up to 2.19.91, added TODO
 
 Revision 1.152  2007/08/06 12:01:47  patrys
 - rebuild with new xulrunner
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/epiphany.spec?r1=1.153&r2=1.154&f=u