- merged deps update and mozilla_firefox bcond switch from AC-branch

Changed files:
    yelp.spec -> 1.79

diff --git a/yelp.spec b/yelp.spec
index 201175ea1eaa943fba8ed8dcacaf714bc289e550..c9027363421b7e2fbcc50df7dcadbf8cb6382761 100644 (file)
--- a/yelp.spec
+++ b/yelp.spec
@@ -1,12 +1,12 @@
 #
 # Conditinal build:
-%bcond_with    mozilla_firefox         # build with mozilla-firefox
+%bcond_without mozilla_firefox         # build with mozilla instead of mozilla-firefox
 #
 Summary:       A system documentation reader from the GNOME project
 Summary(pl):   Czytnik dokumentacji z projektu GNOME
 Name:          yelp
 Version:       2.14.1
-Release:       2
+Release:       4
 License:       GPL
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/gnome/sources/yelp/2.14/%{name}-%{version}.tar.bz2
@@ -15,18 +15,18 @@ Patch0:             %{name}-desktop.patch
 Patch1:                %{name}-m4.patch
 Patch2:                %{name}-bs.patch
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.12.0
-BuildRequires: ORBit2-devel >= 1:2.12.4
+BuildRequires: GConf2-devel >= 2.14.0
+BuildRequires: ORBit2-devel >= 1:2.14.0
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: beagle-devel
 BuildRequires: bzip2-devel
 BuildRequires: glib2-devel >= 1:2.8.1
-BuildRequires: gnome-common >= 2.8.0
+BuildRequires: gnome-common >= 2.12.0
 BuildRequires: gnome-doc-utils >= 0.4.0
-BuildRequires: gnome-vfs2-devel >= 2.12.0
+BuildRequires: gnome-vfs2-devel >= 2.14.0
 BuildRequires: libglade2-devel >= 1:2.5.1
-BuildRequires: libgnomeui-devel >= 2.12.0
+BuildRequires: libgnomeui-devel >= 2.14.0
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 2.6.21
 BuildRequires: libxslt-devel >= 1.1.5
@@ -42,7 +42,8 @@ BuildRequires:        zlib-devel
 Requires(post,preun):  GConf2
 Requires:      docbook-style-xsl >= 1.55.0
 Requires:      gnome-doc-utils >= 0.4.0
-Requires:      gnome-vfs2 >= 2.12.0
+Requires:      gnome-vfs2 >= 2.14.0
+Requires:      libgnomeui >= 2.14.0
 Requires:      scrollkeeper
 %if %{with mozilla_firefox}
 %requires_eq   mozilla-firefox