- release 3

[packages/epiphany.git] / epiphany.spec

diff --git a/epiphany.spec b/epiphany.spec
index c175fa18375aebc78722a0eaea86ba8aca736894..2a8e948e7beaf6eb889ba2aa12ffd4aa69eb41c3 100644 (file)
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -1,26 +1,26 @@
 #
 #Conditional build:
-%bcond_with    webkit          # Build with experimental webkit suppor instead of xulrunner
+%bcond_with    webkit          # Build with experimental webkit support instead of xulrunner
 #
-%define                basever         2.22
+%define                basever         2.24
 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.22.3
-Release:       2
+Version:       2.24.3
+Release:       3
 License:       GPL v2
 Group:         X11/Applications/Networking
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.22/%{name}-%{version}.tar.bz2
-# Source0-md5: 7d058b57cb3e992889e456848fcc89a9
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.24/%{name}-%{version}.tar.bz2
+# Source0-md5: af51614c7b78f8b8c68e9ece3d8f4d8f
 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
 Patch7:                %{name}-build_date.patch
+Patch8:                %{name}-xulrunner-plugins-dir.patch
 URL:           http://www.gnome.org/projects/epiphany/
 BuildRequires: GConf2-devel >= 2.20.0
 BuildRequires: NetworkManager-devel
@@ -52,7 +52,7 @@ 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: rpmbuild(macros) >= 1.364
 BuildRequires: scrollkeeper
 BuildRequires: startup-notification-devel >= 0.8
 %if %{without webkit}
@@ -67,7 +67,10 @@ Requires(post,preun):        GConf2
 Requires:      dbus >= 1.0.2
 Requires:      gnome-icon-theme >= 2.22.0
 Requires:      libgnomeui >= 2.22.0
+Provides:      wwwbrowser
 %if %{without webkit}
+Requires:      browser-plugins >= 2.0
+Requires:      browser-plugins(%{_target_base_arch})
 %requires_eq   xulrunner
 %endif
 Obsoletes:     python-epiphany
@@ -134,11 +137,8 @@ Dokumentacja API Epiphany.
 %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
+%patch8 -p1
 
 %build
 %{__gnome_doc_prepare}
@@ -153,14 +153,14 @@ mv po/sr@{Latn,latin}.po
 %configure \
        --disable-schemas-install \
        --enable-dbus \
-       %{?!with_webkit:--enable-gtk-doc} \
+       %{!?with_webkit:--enable-gtk-doc} \
        --enable-network-manager \
        --enable-python \
-       %if %{with webkit}
+%if %{with webkit}
        --with-engine=webkit \
-       %else
+%else
        --with-gecko=libxul-embedding \
-       %endif
+%endif
        --with-html-dir=%{_gtkdocdir}
 %{__make}
 
@@ -168,6 +168,8 @@ mv po/sr@{Latn,latin}.po
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/%{basever}/extensions
 
+%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/%{basever}/plugins
+
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        HTML_DIR=%{_gtkdocdir}
@@ -188,6 +190,9 @@ rm -rf $RPM_BUILD_ROOT
 %scrollkeeper_update_post
 %update_desktop_database_post
 %update_icon_cache hicolor
+%if %{without webkit}
+%update_browser_plugins
+%endif
 
 %preun
 %gconf_schema_uninstall epiphany-fonts.schemas
@@ -199,10 +204,22 @@ rm -rf $RPM_BUILD_ROOT
 %scrollkeeper_update_postun
 %update_desktop_database_postun
 %update_icon_cache hicolor
+%if %{without webkit}
+if [ "$1" = 0 ]; then
+       %update_browser_plugins
+fi
+%endif
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
+
+%if %{without webkit}
+# browser plugins v2
+%{_browserpluginsconfdir}/browsers.d/%{name}.*
+%config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
+%endif
+
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/%{name}