X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=epiphany.spec;h=c175fa18375aebc78722a0eaea86ba8aca736894;hb=e7c3d2b149f948db1d6a313b24fe1f92c10d9aea;hp=0817b19f693e437d3b0d1d26cb510197fb1ff209;hpb=7a6afcfe10eb8ce4317c18641d55caa9311a8d32;p=packages%2Fepiphany.git

diff --git a/epiphany.spec b/epiphany.spec
index 0817b19..c175fa1 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -2,20 +2,25 @@
 #Conditional build:
 %bcond_with	webkit		# Build with experimental webkit suppor instead of xulrunner
 #
-%define		basever		2.20
+%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.1
-Release:	4
+Version:	2.22.3
+Release:	2
 License:	GPL v2
 Group:		X11/Applications/Networking
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5:	bacb5c7f1a421f6d5adbec35d4cab3ea
+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}-agent.patch
+Patch2:		%{name}-ti-agent.patch
+Patch3:		%{name}-agent.patch
+Patch4:		%{name}-lt.patch
+Patch5:		%{name}-libxul.patch
+Patch6:		%{name}-ssl_oldapi.patch
+Patch7:		%{name}-build_date.patch
 URL:		http://www.gnome.org/projects/epiphany/
 BuildRequires:	GConf2-devel >= 2.20.0
 BuildRequires:	NetworkManager-devel
@@ -27,7 +32,7 @@ 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.20.0
+BuildRequires:	gnome-vfs2-devel >= 2.22.0
 BuildRequires:	gtk+2-devel >= 2:2.12.0
 BuildRequires:	gtk-doc >= 1.8
 %if %{with webkit}
@@ -38,21 +43,21 @@ BuildRequires:	intltool >= 0.36.2
 BuildRequires:	iso-codes >= 0.53
 BuildRequires:	libglade2-devel >= 1:2.6.2
 BuildRequires:	libgnomeprintui-devel >= 2.18.0
-BuildRequires:	libgnomeui-devel >= 2.20.0
+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.20.0
 BuildRequires:	python-pygtk-devel >= 2:2.12.0
-# support for --with-omf in find_lang.sh
-BuildRequires:	rpm-build >= 4.4.9-10
+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
@@ -60,8 +65,8 @@ Requires(post,postun):	hicolor-icon-theme
 Requires(post,postun):	scrollkeeper
 Requires(post,preun):	GConf2
 Requires:	dbus >= 1.0.2
-Requires:	gnome-icon-theme >= 2.20.0
-Requires:	libgnomeui >= 2.20.0
+Requires:	gnome-icon-theme >= 2.22.0
+Requires:	libgnomeui >= 2.22.0
 %if %{without webkit}
 %requires_eq	xulrunner
 %endif
@@ -122,15 +127,18 @@ Dokumentacja API Epiphany.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%if "%{pld_release}" == "ti"
 %patch2 -p1
+%else
+%patch3 -p1
+%endif
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
-sed -i -e s#sr\@Latn#sr\@latin# po/LINGUAS
-mv po/sr\@{Latn,latin}.po
-
-sed -i -e 's#WebKitGdk#WebKitGtk#g' configure.ac
-sed -i -e 's#WebKitGtkPage#WebKitPage#g' embed/webkit/*.cpp embed/webkit/*.h
-sed -i -e 's#webkit_gtk_#webkit_#g' embed/webkit/*.cpp embed/webkit/*.h
-sed -i -e 's#WEBKIT_GTK_PAGE#WEBKIT_PAGE#g' embed/webkit/*.cpp embed/webkit/*.h
+sed -i -e 's#sr@Latn#sr@latin#' po/LINGUAS
+mv po/sr@{Latn,latin}.po
 
 %build
 %{__gnome_doc_prepare}
@@ -147,9 +155,12 @@ sed -i -e 's#WEBKIT_GTK_PAGE#WEBKIT_PAGE#g' embed/webkit/*.cpp embed/webkit/*.h
 	--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}
 
@@ -162,6 +173,7 @@ 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 --with-omf