--- a/ChangeLog	Thu Mar 18 13:20:46 2004 +0000
+++ b/ChangeLog	Thu Mar 18 13:21:27 2004 +0000
@@ -1,3 +1,8 @@
+2004-03-18  Matt Keenan  <[email protected]>
+
+	* yelp.spec : Bump to 2.5.91
+	* patches/yelp-01-yelp_idl_includes.diff : re-apply
+
 2004-03-18  Matt Keenan  <[email protected]>
 
 	* libxslt.spec : Bump to 1.1.4

--- a/patches/yelp-01-yelp_idl_includes.diff	Thu Mar 18 13:20:46 2004 +0000
+++ b/patches/yelp-01-yelp_idl_includes.diff	Thu Mar 18 13:21:27 2004 +0000
@@ -1,11 +1,11 @@
---- yelp-2.5.3/configure.in	2004-01-13 00:03:26.000000000 +0000
-+++ yelp-2.5.3.new/configure.in	2004-02-04 16:50:29.000000000 +0000
+--- ../yelp-2.5.91.old/configure.in	2004-03-18 12:59:36.000000000 +0000
++++ ./configure.in	2004-03-18 13:04:26.000000000 +0000
 @@ -61,7 +61,7 @@
- 
- YELP_MODULES="gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0"
- 
--YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| sed -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'`"
-+YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| sed -e 's/^/ /' -e 's/ \/$//' -e 's/ \// -I \//g' -e 's/^ \///'`"
- AC_SUBST(YELP_IDL_INCLUDES)
- 
- dnl Check for whereis
+ idl_dirs="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0`"
+ AC_PATH_PROGS(SED, gsed sed)
+ if ${SED} --version 2>/dev/null | grep GNU >/dev/null 2>&1; then
+-  YELP_IDL_INCLUDES="`echo ${idl_dirs} | ${SED} -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'`"
++  YELP_IDL_INCLUDES="`echo ${idl_dirs} | ${SED} -e 's/^/ /' -e 's/ \/$//' -e 's/ \// -I \//g' -e 's/^ \///'`"
+ else
+   YELP_IDL_INCLUDES="`echo ${idl_dirs} | ${SED} -E -e 's/^/ /' -e 's/ +$//' -e 's/ +/ -I /g' -e 's/^ +//'`"
+ fi

--- a/yelp.spec	Thu Mar 18 13:20:46 2004 +0000
+++ b/yelp.spec	Thu Mar 18 13:21:27 2004 +0000
@@ -9,13 +9,13 @@
 Name:         yelp 
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.5.5
-Release:      8
+Version:      2.5.91
+Release:      1
 Distribution: Cinnabar
 Vendor:	      Sun Microsystems, Inc.
 Summary:      The GNOME 2.4 Help Browser 
-Source:       http://ftp.gnome.org/pub/GNOME/sources/yelp/2.4/yelp-%{version}.tar.bz2
-Source1:      yelp-l10n-po-0.8.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/yelp/2.5/yelp-%{version}.tar.bz2
+Source1:      yelp-l10n-po-0.9.tar.bz2
 Source2:      gnome-help.1.gz
 Source3:      yelp.1.gz
 Patch1:       yelp-01-yelp_idl_includes.diff
@@ -103,6 +103,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Mar 18 2004 - [email protected]
+- Bump to 2.5.91
+
 * Thu Mar 11 2004 - [email protected]
 - added yelp-03-g11n-potfiles.diff