- rel.4, fixed summaries and descriptions, update icon cache, use HEAD deps

  dropped obsolete mozilla 1.7.x support, remove unneeded files

Changed files:
    devhelp.spec -> 1.61

diff --git a/devhelp.spec b/devhelp.spec
index 50113ca67b91732890b85b666ba69badde233790..2b3618ef11b1dffc62338c51239a605d13c9669f 100644 (file)
--- a/devhelp.spec
+++ b/devhelp.spec
@@ -1,13 +1,8 @@
-#
-# Conditional build:
-%bcond_without mozilla_firefox # build with mozilla instead of mozilla-firefox
-#
-%define                minmozver       5:1.7
-Summary:       DevHelp is a developer's help program for GNOME
-Summary(pl):   Program pomocy dla programistów GNOME
+Summary:       API documentation browser for GNOME
+Summary(pl):   Przegl±darka dokumentacji API dla GNOME
 Name:          devhelp
 Version:       0.12
-Release:       3
+Release:       4
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/devhelp/0.12/%{name}-%{version}.tar.gz
@@ -16,40 +11,34 @@ Patch0:             %{name}-bookdir.patch
 Patch1:                %{name}-mozilla_includes.patch
 Patch2:                %{name}-desktop.patch
 URL:           http://www.imendio.com/projects/devhelp/
-BuildRequires: GConf2-devel
+BuildRequires: GConf2-devel >= 2.14.0
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: gnome-common >= 2.8.0
-BuildRequires: gnome-vfs2-devel >= 2.10.0-2
-BuildRequires: gtk+2-devel >= 2:2.6.4
-BuildRequires: libglade2-devel >= 1:2.5.1
+BuildRequires: gnome-common >= 2.12.0
+BuildRequires: gnome-vfs2-devel >= 2.15.91
+BuildRequires: gtk+2-devel >= 2:2.10.1
+BuildRequires: libglade2-devel >= 1:2.6.0
 BuildRequires: libtool
-%if %{with mozilla_firefox}
-BuildRequires: mozilla-firefox-devel
-%else
-BuildRequires: mozilla-devel >= %{minmozver}
-%endif
+BuildRequires: libwnck-devel >= 2.15.91
+BuildRequires: mozilla-firefox-devel >= 1.5.0.6
 BuildRequires: pkgconfig
 BuildRequires: python
-BuildRequires: rpmbuild(macros) >= 1.197
+BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: zlib-devel
-Requires(post,preun):  GConf2
+Requires(post,preun):  GConf2 >= 2.14.0
+Requires(post,post):   gtk+2 >= 2.10.1
 Requires:      %{name}-libs = %{version}-%{release}
-%if %{with mozilla_firefox}
 %requires_eq   mozilla-firefox
-%else
-Requires:      mozilla = %(rpm -q --qf '%{EPOCH}:%{VERSION}' --whatprovides mozilla)
-%endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # can be provided by mozilla or mozilla-embedded
 %define                _noautoreqdep   libgtkembedmoz.so libxpcom.so
 
 %description
-DevHelp is a developer's help program for GNOME.
+API documentation browser for GNOME.
 
 %description -l pl
-Program pomocy dla programistów GNOME.
+Przegl±darka dokumentacji API dla GNOME.
 
 %package libs
 Summary:       Library to embed Devhelp in other applications
@@ -57,10 +46,10 @@ Summary(pl):        Biblioteka do osadzania Devhelp w innych aplikacjach
 Group:         Libraries
 
 %description libs
-Library of Devhelp for embedding into other applications..
+Library of Devhelp for embedding into other applications.
 
 %description libs -l pl
-Biblioteka Devhelp do osadzania w innych aplikacjach..
+Biblioteka Devhelp do osadzania w innych aplikacjach.
 
 %package devel
 Summary:       Headers for Devhelp library
@@ -94,12 +83,10 @@ Requires:   %{name} = %{version}-%{release}
 Requires:      gedit2
 
 %description -n gedit2-plugin-devhelp
-This plugin enables GTK+ documentation browser using devhelp
-libraries.
+Allows to browse API documentation in Gedit.
 
 %description -n gedit2-plugin-devhelp -l pl
-Wtyczka umo¿liwiaj±ca przegl±danie dokumentacji GTK+ przy pomocy
-bibliotek devhelpa.
+Umo¿liwia przegl±danie dokumentacji API w Gedit.
 
 %prep
 %setup -q
@@ -126,6 +113,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/gconf \
        DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info
+rm -f $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/%{name}/*.py
 
 %find_lang %{name}
 
@@ -134,10 +122,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %gconf_schema_install devhelp.schemas
+%update_icon_cache hicolor
 
 %preun
 %gconf_schema_uninstall devhelp.schemas
 
+%postun
+%update_icon_cache hicolor
+
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
@@ -148,7 +140,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 %{_desktopdir}/*.desktop
 %{_iconsdir}/hicolor/*/apps/*
-%{_sysconfdir}/gconf/schemas/*
+%{_sysconfdir}/gconf/schemas/devhelp.schemas
 
 %files libs
 %defattr(644,root,root,755)
@@ -167,6 +159,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n gedit2-plugin-devhelp
 %defattr(644,root,root,755)
-%{_libdir}/gedit-2/plugins/%{name}.gedit-plugin
 %dir %{_libdir}/gedit-2/plugins/%{name}
+%{_libdir}/gedit-2/plugins/%{name}.gedit-plugin
 %{_libdir}/gedit-2/plugins/%{name}/*.py[oc]