- 2.15.2, GNOME 2.15.x deps, (re)generate icon cache, remove unsupported

[packages/yelp.git] / yelp.spec

diff --git a/yelp.spec b/yelp.spec
index 74ba69de7a4219293b36e579c947f64e184ee27c..01a10fcb3c76833c93490f9033eacf8331982529 100644 (file)
--- a/yelp.spec
+++ b/yelp.spec
@@ -5,14 +5,13 @@
 Summary:       A system documentation reader from the GNOME project
 Summary(pl):   Czytnik dokumentacji z projektu GNOME
 Name:          yelp
-Version:       2.14.2
+Version:       2.15.2
 Release:       1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/yelp/2.14/%{name}-%{version}.tar.bz2
-# Source0-md5: 4294fe3b01824675bd8be9d7936dcaa7
+Source0:       http://ftp.gnome.org/pub/gnome/sources/yelp/2.15/%{name}-%{version}.tar.bz2
+# Source0-md5: 0a6928685d289b67773eeff6ae90869b
 Patch0:                %{name}-desktop.patch
-Patch1:                %{name}-m4.patch
 Patch2:                %{name}-bs.patch
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.14.0
@@ -22,13 +21,13 @@ BuildRequires:      automake
 BuildRequires: beagle-devel
 BuildRequires: bzip2-devel
 BuildRequires: gnome-common >= 2.12.0
-BuildRequires: gnome-doc-utils >= 0.4.0
-BuildRequires: gnome-vfs2-devel >= 2.14.2
+BuildRequires: gnome-doc-utils >= 0.6.0
+BuildRequires: gnome-vfs2-devel >= 2.15.1
 BuildRequires: libglade2-devel >= 1:2.5.1
-BuildRequires: libgnomeui-devel >= 2.14.1
+BuildRequires: libgnomeui-devel >= 2.15.1
 BuildRequires: libtool
-BuildRequires: libxml2-devel >= 2.6.21
-BuildRequires: libxslt-devel >= 1.1.5
+BuildRequires: libxml2-devel >= 2.6.26
+BuildRequires: libxslt-devel >= 1.1.17
 %if %{with mozilla_firefox}
 BuildRequires: mozilla-firefox-devel
 %else
@@ -38,11 +37,12 @@ BuildRequires:      pkgconfig >= 1:0.15.0
 BuildRequires: popt-devel
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: zlib-devel
-Requires(post,preun):  GConf2
+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.4.0
-Requires:      gnome-vfs2 >= 2.14.2
-Requires:      libgnomeui >= 2.14.1
+Requires:      gnome-doc-utils >= 0.6.0
+Requires:      gnome-vfs2 >= 2.15.1
+Requires:      libgnomeui >= 2.15.1
 Requires:      scrollkeeper
 %if %{with mozilla_firefox}
 %requires_eq   mozilla-firefox
@@ -66,7 +66,6 @@ narz
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 
 %build
@@ -83,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/ug
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -92,10 +91,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %gconf_schema_install yelp.schemas
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 
 %preun
 %gconf_schema_uninstall yelp.schemas
 
+%postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README ChangeLog NEWS TODO AUTHORS
@@ -103,5 +106,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/bonobo/servers/*
 %{_datadir}/%{name}
 %{_desktopdir}/*
-%{_iconsdir}/hicolor/192x192/apps/yelp-icon-big.png
+%{_iconsdir}/hicolor/*/*/yelp-icon-big.png
 %{_sysconfdir}/gconf/schemas/yelp.schemas