--- a/ChangeLog	Fri Aug 01 15:44:45 2003 +0000
+++ b/ChangeLog	Fri Aug 01 15:49:25 2003 +0000
@@ -1,3 +1,9 @@
+2003-08-01  Glynn Foster  <[email protected]>
+
+	* patches/yelp-03-menu-entry.diff: Add
+	menu categorization.
+	* yelp.spec: Update
+
 2003-08-01  Mark McLoughlin  <[email protected]>
 
 	* gdm.spec: upgrade to 2.4.2.99.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/yelp-03-menu-entry.diff	Fri Aug 01 15:49:25 2003 +0000
@@ -0,0 +1,11 @@
+--- yelp-2.2.3/yelp.desktop.in	2002-12-03 06:08:01.000000000 -0800
++++ yelp-2.2.3-hacked/yelp.desktop.in	2003-08-01 09:44:10.000000000 -0700
+@@ -6,7 +6,7 @@
+ Icon=gnome-help.png
+ Terminal=false
+ Type=Application
+-Categories=GNOME;Application;Core;
++Categories=GNOME;Application;Core;X-Sun-Supported;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=Yelp
+ X-GNOME-Bugzilla-Component=general

--- a/yelp.spec	Fri Aug 01 15:44:45 2003 +0000
+++ b/yelp.spec	Fri Aug 01 15:49:25 2003 +0000
@@ -10,14 +10,15 @@
 License:      GPL
 Group:        System/GUI/GNOME
 Version:      2.2.3
-Release:      8
+Release:      9
 Distribution: Mercury
 Vendor:	      Sun Microsystems, Inc.
 Summary:      The GNOME 2.0 Help Browser 
 Source:       http://ftp.gnome.org/pub/GNOME/sources/yelp/2.2/yelp-%{version}.tar.bz2
 Source1:      yelp-l10n-po.tar.bz2
-Patch0:       yelp-01-lang-select.diff
-Patch1:       yelp-02-window-icon.diff
+Patch1:       yelp-01-lang-select.diff
+Patch2:       yelp-02-window-icon.diff
+Patch3:       yelp-03-menu-entry.diff
 URL:          www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Autoreqprov:  on
@@ -57,10 +58,16 @@
 %prep
 %setup -q
 tar -jxf %SOURCE1
-%patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
+libtoolize --force
+aclocal -I /usr/share/aclocal/gnome2-macros
+automake -a -c -f
+autoconf
+
 ./configure \
     --prefix=%{_prefix} \
     --sysconfdir=%{_sysconfdir} \
@@ -86,8 +93,12 @@
 %{_libexecdir}/*
 
 %changelog
+* Fri Aug 01 2003 - [email protected]
+- Add menu categorization.
+
 * Wed Jul 23 2003 - [email protected]
 - Add back window icon.
+
 * Thu Jul 10 2003 - [email protected]
 - Added .po tarball