- 2.20.0

Changed files:
    epiphany.spec -> 1.154

diff --git a/epiphany.spec b/epiphany.spec
index 721b94409629e1635c62de2a5d72c014458adb9a..34b6c4b9e5356e59d51fef9c9fe824065363dbdb 100644 (file)
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -1,19 +1,24 @@
-%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
@@ -26,6 +31,10 @@ BuildRequires:       gnome-doc-utils >= 0.10.1
 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
@@ -40,8 +49,10 @@ BuildRequires:       python-pygtk-devel >= 2:2.10.4
 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
@@ -50,14 +61,18 @@ Requires(post,preun):       GConf2
 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).
@@ -102,11 +117,10 @@ Dokumentacja API Epiphany.
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 %{__gnome_doc_prepare}
@@ -121,8 +135,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}
 
@@ -168,7 +185,7 @@ 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
@@ -177,8 +194,10 @@ rm -rf $RPM_BUILD_ROOT
 %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