- 2.15.5, updated BR, renumbered patches, use rpm macros

Changed files:
    yelp.spec -> 1.84

diff --git a/yelp.spec b/yelp.spec
index 06e145a40a131c498df056294380ad4cd457ea44..c17532cfa9ff3553b748b8f366af343bf38d1dc2 100644 (file)
--- a/yelp.spec
+++ b/yelp.spec
@@ -1,17 +1,17 @@
 Summary:       A system documentation reader from the GNOME project
 Summary(pl):   Czytnik dokumentacji z projektu GNOME
 Name:          yelp
-Version:       2.15.4
+Version:       2.15.5
 Release:       1
 License:       GPL
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/gnome/sources/yelp/2.15/%{name}-%{version}.tar.bz2
-# Source0-md5: ea76093b608c1eed90ff477d0aca049d
+# Source0-md5: ae48d9f1c3ce8210b40b598bbb6ac064
 Patch0:                %{name}-desktop.patch
-Patch2:                %{name}-bs.patch
+Patch1:                %{name}-bs.patch
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.14.0
-BuildRequires: ORBit2-devel >= 1:2.14.0
+BuildRequires: ORBit2-devel >= 1:2.14.2
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: beagle-devel >= 0.2.7
@@ -19,23 +19,22 @@ BuildRequires:      bzip2-devel
 BuildRequires: dbus-glib-devel >= 0.62
 BuildRequires: gnome-common >= 2.12.0
 BuildRequires: gnome-doc-utils >= 0.7.1
-BuildRequires: gnome-vfs2-devel >= 2.15.3
+BuildRequires: gnome-vfs2-devel >= 2.15.90
 BuildRequires: libglade2-devel >= 1:2.6.0
-BuildRequires: libgnomeui-devel >= 2.15.2
+BuildRequires: libgnomeui-devel >= 2.15.90
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 1:2.6.26
 BuildRequires: libxslt-devel >= 1.1.17
 BuildRequires: mozilla-firefox-devel
 BuildRequires: pkgconfig >= 1:0.15.0
-BuildRequires: popt-devel
-BuildRequires: rpmbuild(macros) >= 1.197
+BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: zlib-devel
 Requires(post,preun):  GConf2 >= 2.14.0
 Requires(post,postun): gtk+2 >= 2:2.9.2
 Requires:      docbook-style-xsl >= 1.55.0
 Requires:      gnome-doc-utils >= 0.7.1
-Requires:      gnome-vfs2 >= 2.15.3
-Requires:      libgnomeui >= 2.15.2
+Requires:      gnome-vfs2 >= 2.15.90
+Requires:      libgnomeui >= 2.15.90
 Requires:      scrollkeeper
 %requires_eq   mozilla-firefox
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -55,14 +54,13 @@ narz
 %prep
 %setup -q
 %patch0 -p1
-%patch2 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
-LDFLAGS="%{rpmldflags} -Wl,--as-needed"
 %configure
 %{__make}
 
@@ -81,13 +79,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %gconf_schema_install yelp.schemas
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+%update_icon_cache hicolor
 
 %preun
 %gconf_schema_uninstall yelp.schemas
 
 %postun
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+%update_icon_cache hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)