- merged update to 2.14.1.1 and deps update from AC-branch

Changed files:
    epiphany.spec -> 1.113

diff --git a/epiphany.spec b/epiphany.spec
index e88f58f392ae5b18d236a2d9e707c98fa2882165..8b7fc0dace717c82b1e3a178560b7e127240e0cd 100644 (file)
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -1,39 +1,40 @@
+#
 # Conditinal build:
-%bcond_without mozilla_firefox # build without mozilla-firefox-devel
+%bcond_without mozilla_firefox # build with mozilla instead of mozilla-firefox
 #
 %define                basever 2.14
 Summary:       Epiphany - gecko-based GNOME web browser
 Summary(es):   Epiphany - navigador Web de GNOME basado en gecko
 Summary(pl):   Epiphany - przegl±darka WWW dla GNOME
 Name:          epiphany
-Version:       2.14.1
-Release:       3
+Version:       2.14.1.1
+Release:       1
 License:       GPL v2
 Group:         X11/Applications/Networking
 Source0:       http://ftp.gnome.org/pub/gnome/sources/epiphany/%{basever}/%{name}-%{version}.tar.bz2
-# Source0-md5: 69f9760646b736d953f24442e0e38f7b
+# Source0-md5: f5770a6a934997382b91349bdc40af04
 Patch0:                %{name}-first-tab.patch
 Patch1:                %{name}-desktop.patch
 Patch2:                %{name}-mozilla_includes.patch
 Patch3:                %{name}-pld-homepage.patch
 Patch4:                %{name}-configure.patch
 URL:           http://www.gnome.org/projects/epiphany/
-BuildRequires: GConf2-devel >= 2.10.0
-BuildRequires: ORBit2-devel >= 1:2.12.1
+BuildRequires: GConf2-devel >= 2.14.0
+BuildRequires: ORBit2-devel >= 1:2.14.0
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1.8
-BuildRequires: dbus-glib-devel >= 0.34
+BuildRequires: dbus-glib-devel >= 0.60
 BuildRequires: gnome-common >= 2.8.0
-BuildRequires: gnome-desktop-devel >= 2.10.0-2
+BuildRequires: gnome-desktop-devel >= 2.14.0
 BuildRequires: gnome-doc-utils >= 0.3.2-1
-BuildRequires: gnome-vfs2-devel >= 2.10.0-2
+BuildRequires: gnome-vfs2-devel >= 2.14.0
 BuildRequires: gtk+2-devel >= 2:2.8.3
 BuildRequires: gtk-doc >= 1.3
 BuildRequires: intltool >= 0.33
 BuildRequires: iso-codes >= 0.35
 BuildRequires: libglade2-devel >= 1:2.5.1
-BuildRequires: libgnomeprintui-devel >= 2.11.0-3
-BuildRequires: libgnomeui-devel >= 2.10.0-2
+BuildRequires: libgnomeprintui-devel >= 2.12.0
+BuildRequires: libgnomeui-devel >= 2.14.0
 BuildRequires: startup-notification-devel >= 0.5
 BuildRequires: libtool
 BuildRequires: libxslt-devel >= 1.1.15
@@ -50,9 +51,10 @@ BuildRequires:       scrollkeeper
 Requires(post,preun):  GConf2
 Requires(post,postun): desktop-file-utils
 Requires(post,postun): scrollkeeper
-Requires:      dbus >= 0.34
-Requires:      gnome-icon-theme >= 2.10.0
+Requires:      dbus >= 0.60
+Requires:      gnome-icon-theme >= 2.14.0
 Requires:      gtk+2 >= 2:2.8.3
+Requires:      libgnomeui >= 2.14.0
 %if %{with mozilla_firefox}
 %requires_eq   mozilla-firefox
 %else