- release 3

[packages/epiphany.git] / epiphany.spec

diff --git a/epiphany.spec b/epiphany.spec
index 767418d4b5303f84a82503b14dcecd831d58fb29..7e5a7a1eaa9d22bf8e41948ba5725fb37fe31ff5 100644 (file)
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -2,30 +2,32 @@
 #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:       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.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: 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.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: 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}
@@ -36,13 +38,14 @@ 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
+BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: scrollkeeper
 BuildRequires: startup-notification-devel >= 0.8
@@ -56,12 +59,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.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
 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}
@@ -118,6 +123,9 @@ Dokumentacja API Epiphany.
 %patch1 -p1
 %patch2 -p1
 
+sed -i -e 's#sr\@Latn#sr\@latin#' po/LINGUAS
+mv po/sr\@{Latn,latin}.po
+
 %build
 %{__gnome_doc_prepare}
 %{__gnome_doc_common}
@@ -148,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
@@ -186,7 +195,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