rpms/yelp/FC-6 yelp.spec,1.83,1.84

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/yelp/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv12120

Modified Files:
	yelp.spec 
Log Message:
improve man page handling



Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/FC-6/yelp.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- yelp.spec	30 Oct 2006 05:11:19 -0000	1.83
+++ yelp.spec	3 Nov 2006 19:54:30 -0000	1.84
@@ -14,7 +14,7 @@
 Summary: A system documentation reader from the Gnome project
 Name: yelp
 Version: 2.16.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
 Patch1: yelp-2.15.5-fedora-docs.patch
@@ -22,6 +22,8 @@
 Patch3: yelp-2.15.91-use-pango.patch 
 Patch4: yelp-2.16.0-dynamic-beagle.patch
 Patch5: yelp-2.16.1-crash-fixes.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=370167
+Patch6: yelp-2.16.0-apropos.patch
 License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-root
@@ -74,6 +76,7 @@
 %patch3 -p1 -b .use-pango
 %patch4 -p1 -b .dynamic-beagle
 %patch5 -p1 -b .crash-fixes
+%patch6 -p1 -b .apropos
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -DENABLE_SEARCH -DENABLE_BEAGLE" %configure	\
@@ -101,8 +104,8 @@
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/yelp.schemas > /dev/null
-update-desktop-database &> /dev/null ||:
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/yelp.schemas >& /dev/null
+update-desktop-database >& /dev/null ||:
 
 # update icon themes
 touch %{_datadir}/icons/hicolor
@@ -112,7 +115,7 @@
 
 %preun
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/yelp.schemas > /dev/null
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/yelp.schemas >& /dev/null || :
 
 %postun
 update-desktop-database &> /dev/null ||:
@@ -126,6 +129,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Fri Nov  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-9
+- Improve the whatis parser
+
 * Mon Oct 30 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-8
 - Improve the previous fix