X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=epiphany.spec;h=a7edb49281e7946db48ba4b386c1e718c2b8d890;hb=0cf5f9f8fb1a838f4e9223833a417dec266a0a95;hp=34b6c4b9e5356e59d51fef9c9fe824065363dbdb;hpb=3428cfceb76a94a202ea1d8aaec532472e57a35e;p=packages%2Fepiphany.git

diff --git a/epiphany.spec b/epiphany.spec
index 34b6c4b..a7edb49 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -1,57 +1,62 @@
 #
-# TODO:	- review first-tab patch
-#
 #Conditional build:
 %bcond_with	webkit		# Build with experimental webkit suppor instead of xulrunner
 #
-%define		basever		2.19
+%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.20.0
+Version:	2.22.3
 Release:	1
 License:	GPL v2
 Group:		X11/Applications/Networking
-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
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5:	7d058b57cb3e992889e456848fcc89a9
+Patch0:		%{name}-pld-homepage.patch
+Patch1:		%{name}-configure.patch
+Patch2:		%{name}-ti-agent.patch
 Patch3:		%{name}-agent.patch
+Patch4:		%{name}-lt.patch
+Patch5:		%{name}-libxul.patch
+Patch6:		%{name}-ssl_oldapi.patch
 URL:		http://www.gnome.org/projects/epiphany/
-BuildRequires:	GConf2-devel >= 2.18.0.1
-BuildRequires:	ORBit2-devel >= 1:2.14.7
+BuildRequires:	GConf2-devel >= 2.20.0
+BuildRequires:	NetworkManager-devel
+BuildRequires:	ORBit2-devel >= 1:2.14.9
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	dbus-glib-devel >= 0.73
-BuildRequires:	gnome-common >= 2.18.0
-BuildRequires:	gnome-desktop-devel >= 2.18.0
-BuildRequires:	gnome-doc-utils >= 0.10.1
-BuildRequires:	gnome-vfs2-devel >= 2.18.0.1
-BuildRequires:	gtk+2-devel >= 2:2.10.14
+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.35.5
+BuildRequires:	intltool >= 0.36.2
 BuildRequires:	iso-codes >= 0.53
-BuildRequires:	libglade2-devel >= 1:2.6.0
+BuildRequires:	libglade2-devel >= 1:2.6.2
 BuildRequires:	libgnomeprintui-devel >= 2.18.0
-BuildRequires:	libgnomeui-devel >= 2.18.1
+BuildRequires:	libgnomeui-devel >= 2.22.0
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 1:2.6.28
 BuildRequires:	libxslt-devel >= 1.1.20
 BuildRequires:	pkgconfig
-BuildRequires:	python-gnome-devel >= 2.18.0
-BuildRequires:	python-pygtk-devel >= 2:2.10.4
+BuildRequires:	python-gnome-devel >= 2.20.0
+BuildRequires:	python-pygtk-devel >= 2:2.12.0
+BuildRequires:	rpm >= 4.4.9-56
+BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	scrollkeeper
 BuildRequires:	startup-notification-devel >= 0.8
 %if %{without webkit}
 BuildRequires:	xulrunner
-BuildRequires:	xulrunner-devel >= 1.8.1.6-1.20070731.2
+BuildRequires:	xulrunner-devel >= 1.9.0.1-1
 %endif
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	gtk+2
@@ -59,12 +64,14 @@ Requires(post,postun):	hicolor-icon-theme
 Requires(post,postun):	scrollkeeper
 Requires(post,preun):	GConf2
 Requires:	dbus >= 1.0.2
-Requires:	gnome-icon-theme >= 2.18.0
-Requires:	libgnomeui >= 2.18.1
+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}
@@ -91,7 +98,7 @@ 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.14
+Requires:	gtk+2-devel >= 2:2.12.0
 Requires:	libxslt-devel >= 1.1.20
 
 %description devel
@@ -117,10 +124,19 @@ Dokumentacja API Epiphany.
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
+%if "%{pld_release}" == "ti"
 %patch2 -p1
+%else
 %patch3 -p1
+%endif
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+
+sed -i -e 's#sr@Latn#sr@latin#' po/LINGUAS
+mv po/sr@{Latn,latin}.po
 
 %build
 %{__gnome_doc_prepare}
@@ -137,9 +153,12 @@ Dokumentacja API Epiphany.
 	--enable-dbus \
 	%{?!with_webkit:--enable-gtk-doc} \
 	--enable-network-manager \
-	--enable-python\
-	--enable-spell-checker \
-	%{?with_webkit:--with-engine=webkit} \
+	--enable-python \
+	%if %{with webkit}
+	--with-engine=webkit \
+	%else
+	--with-gecko=libxul-embedding \
+	%endif
 	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
@@ -152,8 +171,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
@@ -190,7 +210,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_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