X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=epiphany.spec;h=7e5a7a1eaa9d22bf8e41948ba5725fb37fe31ff5;hb=da80ccd7a27fec987f400c202aefaba96c7c35ce;hp=f902228d4be4e7e21fd34a3cf02724b5e0d42e68;hpb=93f76e9ba96415af09ae370f3ea7979669e9c4d0;p=packages%2Fepiphany.git

diff --git a/epiphany.spec b/epiphany.spec
index f902228..7e5a7a1 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -1,65 +1,87 @@
-%define		basever		2.16
+#
+#Conditional build:
+%bcond_with	webkit		# Build with experimental webkit suppor instead of xulrunner
+#
+%define		basever		2.22
 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.16.3
-Release:	2
+Version:	2.22.1.1
+Release:	3
 License:	GPL v2
 Group:		X11/Applications/Networking
-Source0:	http://ftp.gnome.org/pub/gnome/sources/epiphany/2.16/%{name}-%{version}.tar.bz2
-# Source0-md5:	3ee93d168eb5720a96f4c7adf2cdf2d4
-Patch0:		%{name}-first-tab.patch
-Patch1:		%{name}-desktop.patch
-Patch2:		%{name}-pld-homepage.patch
-Patch3:		%{name}-configure.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5:	24bb8c430a6165b9c43a2ed0452cc6a5
+Patch0:		%{name}-pld-homepage.patch
+Patch1:		%{name}-configure.patch
+Patch2:		%{name}-agent.patch
 URL:		http://www.gnome.org/projects/epiphany/
-BuildRequires:	GConf2-devel >= 2.16.0
-BuildRequires:	ORBit2-devel >= 1:2.14.6
+BuildRequires:	GConf2-devel >= 2.20.0
+BuildRequires:	NetworkManager-devel
+BuildRequires:	ORBit2-devel >= 1:2.14.9
 BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake >= 1.8
-BuildRequires:	dbus-glib-devel >= 0.71-2
-BuildRequires:	gnome-common >= 2.12.0
-BuildRequires:	gnome-desktop-devel >= 2.16.3
-BuildRequires:	gnome-doc-utils >= 0.8.0
-BuildRequires:	gnome-vfs2-devel >= 2.16.3
-BuildRequires:	gtk+2-devel >= 2:2.10.9
-BuildRequires:	gtk-doc >= 1.7
-BuildRequires:	intltool >= 0.35.0
+BuildRequires:	automake >= 1:1.9
+BuildRequires:	dbus-glib-devel >= 0.73
+BuildRequires:	enchant-devel >= 1.0
+BuildRequires:	gnome-common >= 2.20.0
+BuildRequires:	gnome-desktop-devel >= 2.20.0
+BuildRequires:	gnome-doc-utils >= 0.12.0
+BuildRequires:	gnome-vfs2-devel >= 2.22.0
+BuildRequires:	gtk+2-devel >= 2:2.12.0
+BuildRequires:	gtk-doc >= 1.8
+%if %{with webkit}
+BuildRequires:	gtk-webkit-devel
+BuildRequires:	libssh2-devel
+%endif
+BuildRequires:	intltool >= 0.36.2
 BuildRequires:	iso-codes >= 0.53
-BuildRequires:	libglade2-devel >= 1:2.6.0
-BuildRequires:	libgnomeprintui-devel >= 2.12.1
-BuildRequires:	libgnomeui-devel >= 2.16.1
+BuildRequires:	libglade2-devel >= 1:2.6.2
+BuildRequires:	libgnomeprintui-devel >= 2.18.0
+BuildRequires:	libgnomeui-devel >= 2.22.0
 BuildRequires:	libtool
-BuildRequires:	libxslt-devel >= 1.1.17
-BuildRequires:	xulrunner-devel >= 1.8.0.4
-BuildRequires:	xulrunner
+BuildRequires:	libxml2-devel >= 1:2.6.28
+BuildRequires:	libxslt-devel >= 1.1.20
 BuildRequires:	pkgconfig
-BuildRequires:	python-gnome-devel >= 2.16.2
-BuildRequires:	python-pygtk-devel >= 2.10.3
+BuildRequires:	python-gnome-devel >= 2.20.0
+BuildRequires:	python-pygtk-devel >= 2:2.12.0
+BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	scrollkeeper
 BuildRequires:	startup-notification-devel >= 0.8
-Requires(post,preun):	GConf2 >= 2.16.0
+%if %{without webkit}
+BuildRequires:	xulrunner
+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
 Requires(post,postun):	scrollkeeper
-Requires:	dbus >= 0.91
-Requires:	gnome-icon-theme >= 2.16.0.1
-Requires:	libgnomeui >= 2.16.1
+Requires(post,preun):	GConf2
+Requires:	dbus >= 1.0.2
+Requires:	gnome-icon-theme >= 2.22.0
+Requires:	libgnomeui >= 2.22.0
+%if %{without webkit}
 %requires_eq	xulrunner
+%endif
 Obsoletes:	python-epiphany
+# sr@Latn vs. sr@latin
+Conflicts:	glibc-misc < 6:2.7
 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).
 
 %description -l es.UTF-8
-Navigador Web de GNOME basado en Gecko (el engine plasmante de Mozilla).
+Navigador Web de GNOME basado en Gecko (el engine plasmante de
+Mozilla).
 
 %description -l pl.UTF-8
 Epiphany jest przeglądarką WWW bazującą na Gecko (mechanizmie
@@ -71,8 +93,8 @@ Summary(es.UTF-8):	Ficheros de cabecera de Epiphany
 Summary(pl.UTF-8):	Pliki nagłówkowe Epiphany
 Group:		X11/Applications/Networking
 # doesn't require base
-Requires:	gtk+2-devel >= 2:2.10.9
-Requires:	libxslt-devel >= 1.1.17
+Requires:	gtk+2-devel >= 2:2.12.0
+Requires:	libxslt-devel >= 1.1.20
 
 %description devel
 Epiphany header files for plugin development.
@@ -100,7 +122,9 @@ Dokumentacja API Epiphany.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+
+sed -i -e 's#sr\@Latn#sr\@latin#' po/LINGUAS
+mv po/sr\@{Latn,latin}.po
 
 %build
 %{__gnome_doc_prepare}
@@ -115,8 +139,11 @@ Dokumentacja API Epiphany.
 %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}
 
@@ -129,8 +156,9 @@ install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/%{basever}/extensions
 	HTML_DIR=%{_gtkdocdir}
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany/%{basever}/plugins/*.la
+rm -rf $RPM_BUILD_ROOT%{_iconsdir}/LowContrastLargePrint
 
-%find_lang %{name} --with-gnome
+%find_lang %{name} --with-gnome --with-omf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -162,17 +190,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_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
 %{_sysconfdir}/gconf/schemas/epiphany.schemas
-%{_omf_dest_dir}/*
 %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