--- a/ChangeLog	Fri Aug 01 15:13:26 2003 +0000
+++ b/ChangeLog	Fri Aug 01 15:14:23 2003 +0000
@@ -1,3 +1,11 @@
+2003-08-01  Glynn Foster  <[email protected]>
+
+	* gconf-editor.spec: Update with new categorization
+	* glade.spec: Add ChangeLog and bump release.
+	* patches/gconf-editor-01-glib2-include.diff: Ugh. Don't patch 
+	generated files.
+	* patches/gconf-editor-02-menu-entry.diff: Add actual patch.
+
 2003-08-01  Ghee Teo  <[email protected]>
 
 	* Update gst-plugins.spec to include plugins dependency for gstreamer-tools

--- a/gconf-editor.spec	Fri Aug 01 15:13:26 2003 +0000
+++ b/gconf-editor.spec	Fri Aug 01 15:14:23 2003 +0000
@@ -2,13 +2,14 @@
 License:      GPL
 Group:        System/GUI/GNOME
 Version:      0.4.0
-Release:      6
+Release:      8
 Distribution: Mercury
 Vendor:       Sun Microsystems, Inc.
 Summary:      Editor/admin tool for GConf
 Source:       ftp://ftp.gnome.org:21/pub/gnome/sources/gconf-editor/2.2/%{name}-%{version}.tar.bz2
 Source1:      gconf-editor-l10n-po.tar.bz2
-Patch0:       gconf-editor-01-glib2-include.diff
+Patch1:       gconf-editor-01-glib2-include.diff
+Patch2:       gconf-editor-02-menu-entry.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/%{name}
@@ -25,11 +26,16 @@
 
 %prep
 %setup -q
-%patch0
+%patch1 -p1
+%patch2 -p1
 
 tar jxvf %SOURCE1
 
 %build
+libtoolize --force
+aclocal -I /usr/share/aclocal/gnome2-macros
+automake -a -c -f
+autoconf
 ./configure --prefix=%{_prefix} \
 	    --sysconfdir=%{_sysconfdir} \
 	    --datadir=%{_datadir}
@@ -52,6 +58,9 @@
 %{_datadir}/applications
 
 %changelog
+* Fri Aug 01 2003 - <[email protected]>
+- add some menu categorization
+
 * Wed Jul 09 2003 - <[email protected]>
 - add in sun po files
 

--- a/glade.spec	Fri Aug 01 15:13:26 2003 +0000
+++ b/glade.spec	Fri Aug 01 15:14:23 2003 +0000
@@ -2,7 +2,7 @@
 License:      GPL
 Group:        System/GUI/GNOME
 Version:      2.0.0
-Release:      7
+Release:      8
 Distribution: Mercury
 Vendor:       Sun Microsystems, Inc.
 Summary:      GLADE User Interface Builder for GNOME
@@ -68,6 +68,9 @@
 %{_prefix}/share/glade-2
 
 %changelog -n glade2
+* Fri Aug 01 2003 - [email protected]
+- Add menu categorization
+
 * Tue Jul 22 2003 - [email protected]
 - Updated POTFILES.in
 

--- a/patches/gconf-editor-01-glib2-include.diff	Fri Aug 01 15:13:26 2003 +0000
+++ b/patches/gconf-editor-01-glib2-include.diff	Fri Aug 01 15:14:23 2003 +0000
@@ -1,5 +1,5 @@
---- ../gconf-editor-0.4.0/src/Makefile.am	2002-07-31 02:55:52.000000000 +0100
-+++ src/Makefile.am	2003-06-05 16:00:15.000000000 +0100
+--- gconf-editor-0.4.0/src/Makefile.am	2002-07-30 18:55:52.000000000 -0700
++++ gconf-editor-0.4.0-hacked/src/Makefile.am	2003-08-01 09:09:03.000000000 -0700
 @@ -2,11 +2,11 @@
  	-DLOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
  	-DGCONF_EDITOR_IMAGEDIR=\""$(datadir)/pixmaps/gconf-editor"\" \
@@ -9,24 +9,8 @@
  	-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
  	-DGNOME_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED \
 -	$(GCONF_EDITOR_CFLAGS)	
-+	$(GCONF_EDITOR_CFLAGS)	\
-+	-I$(includedir)	
++	$(GCONF_EDITOR_CFLAGS)					\	
++	-I$(includedir)
  
  bin_PROGRAMS = gconf-editor
  
---- ../gconf-editor-0.4.0/src/Makefile.in	2002-12-10 17:40:19.000000000 +0000
-+++ src/Makefile.in	2003-06-05 16:05:16.000000000 +0100
-@@ -118,11 +118,11 @@
- 	-DLOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- 	-DGCONF_EDITOR_IMAGEDIR=\""$(datadir)/pixmaps/gconf-editor"\" \
- 	-DIMAGEDIR=\""$(datadir)/pixmaps"\" \
--	-I$(includedir)		\
- 	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
- 	-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
- 	-DGNOME_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED \
--	$(GCONF_EDITOR_CFLAGS)	
-+	$(GCONF_EDITOR_CFLAGS)	\
-+	-I$(includedir) 
- 
- 
- bin_PROGRAMS = gconf-editor

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gconf-editor-02-menu-entry.diff	Fri Aug 01 15:14:23 2003 +0000
@@ -0,0 +1,11 @@
+--- gconf-editor-0.4.0/data/gconf-editor.desktop.in	2002-12-10 09:13:44.000000000 -0800
++++ gconf-editor-0.4.0-hacked/data/gconf-editor.desktop.in	2003-08-01 09:07:12.000000000 -0700
+@@ -7,7 +7,7 @@
+ Type=Application
+ Icon=gconf-editor.png
+ StartupNotify=true
+-Categories=GNOME;Application;System;
++Categories=GNOME;Application;System;X-Sun-Supported;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gconf-editor
+ X-GNOME-Bugzilla-Component=general