--- a/ChangeLog	Thu Jan 25 04:49:00 2007 +0000
+++ b/ChangeLog	Thu Jan 25 08:02:53 2007 +0000
@@ -1,3 +1,12 @@
+2007-01-25  Brian Cameron  <[email protected]>
+
+        * pyspi.spec, gnome-volume-manager.spec, gnome-mount.spec:
+          Fix patch comments.
+        * gimp.spec, gimp-02-fixcompile.diff: Remove unneeded patch.
+        * gdm.spec, gdm-02-branding-general.diff,
+          gdm-06-login-photo-menu.diff: Merge branding patch 6 into branding
+          patch 2.
+
 2007-01-25  Glynn Foster  <[email protected]>
 
 	* README: Update slightly.

--- a/Solaris/ChangeLog	Thu Jan 25 04:49:00 2007 +0000
+++ b/Solaris/ChangeLog	Thu Jan 25 08:02:53 2007 +0000
@@ -1,3 +1,9 @@
+2007-01-25  Brian Cameron  <[email protected]>
+
+	* SUNWgnome-audio.spec: Update patch comments.
+	* patches/audiofile-01-uninstalled-config.diff: Minor correction
+	  to version number.
+
 2007-01-24  Damien Carbery <[email protected]>
 
 	* SUNWgnome-desktop-prefs.spec: Add %{_datadir}/icons to %files.

--- a/Solaris/SUNWgnome-audio.spec	Thu Jan 25 04:49:00 2007 +0000
+++ b/Solaris/SUNWgnome-audio.spec	Thu Jan 25 08:02:53 2007 +0000
@@ -21,9 +21,18 @@
 Source:                  http://ftp.gnome.org/pub/GNOME/sources/esound/0.2/esound-%{esound_version}.tar.bz2
 Source1:                 http://ftp.gnome.org/pub/GNOME/sources/audiofile/0.2/audiofile-%{audiofile_version}.tar.bz2
 Source2:                 %{name}-manpages-0.1.tar.gz
-#owner:yippi date:2004-02-25 type:bug
+# This patch makes it possible to build esound with audiofile before 
+# audiofile before it is installed.  Sort of like an uninstalled.pc file.
+# This patch adds a slightly hacked version of the audiofile-config file to
+# the build directory with some hacks that allow esound to find the right
+# compiler options to build in our environment.  Might be better to enhance
+# audiofile to use actual pc files, though not sure it is worth the effort.
+#owner:yippi date:2004-02-25 type:feature
 Patch1:                  audiofile-01-uninstalled-config.diff
-#owner:yippi date:2004-05-07 type:bug
+# This patch works with the audiofile-01-uninstalled-config.diff to
+# allow esound to be built when audiofile isn't acutally installed on the
+# system.
+#owner:yippi date:2004-05-07 type:feature
 Patch2:                  esound-01-esd-config.diff
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build

--- a/Solaris/patches/audiofile-01-uninstalled-config.diff	Thu Jan 25 04:49:00 2007 +0000
+++ b/Solaris/patches/audiofile-01-uninstalled-config.diff	Thu Jan 25 08:02:53 2007 +0000
@@ -40,7 +40,7 @@
 +      echo $exec_prefix
 +      ;;
 +    --version)
-+      echo 0.2.5
++      echo 0.2.6
 +      ;;
 +    --cflags)
 +      includes=-I$mydir/libaudiofile

--- a/gdm.spec	Thu Jan 25 04:49:00 2007 +0000
+++ b/gdm.spec	Thu Jan 25 08:02:53 2007 +0000
@@ -41,8 +41,6 @@
 Patch4:       gdm-04-current-locale.diff
 #owner:yippi date:2005-05-09 type:bug bugster:5100351
 Patch5:       gdm-05-system-locale.diff
-#owner:yippi date:2005-05-23 type:branding
-Patch6:       gdm-06-login-photo-menu.diff
 URL:          www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}
@@ -113,7 +111,6 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 %ifos linux

--- a/gimp.spec	Thu Jan 25 04:49:00 2007 +0000
+++ b/gimp.spec	Thu Jan 25 08:02:53 2007 +0000
@@ -24,8 +24,6 @@
 Source1:      ftp://ftp.gimp.org/pub/%{name}/help/gimp-help-2-0.%{help_version}.tar.gz
 # date:2003-07-17 owner:gman type:branding
 Patch1:       gimp-01-menu-entry.diff
-# date:2006-06-23 owner:yippi type:bug
-Patch2:       gimp-02-fixcompile.diff
 URL:          http://www.gimp.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -93,7 +91,6 @@
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
 
 gunzip -c %SOURCE1|tar xf -
 
@@ -240,6 +237,8 @@
 %{_mandir}/man1/gimptool-%{subver_install}.1*
 
 %changelog
+* Thu Jan 25 2006 - [email protected]
+- Remove gimp-02-fixcompile.  Fixed upstream.
 * Thu Dec 21 2006 - [email protected]
 - Bump help version to 2.0.11.  Add --without-gimp to help 
   configure so the help docs build.

--- a/gnome-mount.spec	Thu Jan 25 04:49:00 2007 +0000
+++ b/gnome-mount.spec	Thu Jan 25 08:02:53 2007 +0000
@@ -15,7 +15,7 @@
 Vendor:       Sun Microsystems, Inc.
 Summary:      Programs for mounting, unmounting and ejecting storage devices.
 Source:       http://people.freedesktop.org/~david/dist/gnome-mount-%{version}.tar.gz
-#owner:yippi date:2006-06-20 type:bug
+#owner:yippi date:2006-06-20 type:bug bugzilla:400499
 Patch1:       gnome-mount-01-sun-patch.diff
 URL:          www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build

--- a/gnome-volume-manager.spec	Thu Jan 25 04:49:00 2007 +0000
+++ b/gnome-volume-manager.spec	Thu Jan 25 08:02:53 2007 +0000
@@ -17,15 +17,17 @@
 Source:       http://ftp.gnome.org/pub/GNOME/sources/gnome-volume-manager/2.17/gnome-volume-manager-%{version}.tar.bz2
 #owner:yippi date:2006-05-01 type:bug bugzilla:340485
 Patch1:       gnome-volume-manager-01-fixcompile.diff
-#owner:sh162551 date:2006-07-04 type:feature bugster:6849183,6849189,6483288
+# This patch sets the default programs that get run when various media
+# types are inserted.
+#owner:sh162551 date:2006-07-04 type:branding bugster:6849183,6849189,6483288
 Patch2:       gnome-volume-manager-02-autoplay.diff
-#owner:yippi date:2006-07-26 type:bug
+#owner:yippi date:2006-07-26 type:bug bugzilla:348716
 Patch3:       gnome-volume-manager-03-libexec.diff
-#owner:yippi date:2006-09-19 type:bug
+#owner:yippi date:2006-09-19 type:bug bugzilla:400500
 Patch4:       gnome-volume-manager-04-fixlocaluser.diff
-#owner:yippi date:2006-09-26 type:bug
+#owner:yippi date:2006-09-26 type:bug bugzilla:400501
 Patch5:       gnome-volume-manager-05-claimbranch.diff
-#owner:gman date:2006-10-30 type:bug bugzilla:340485
+#owner:gman date:2006-10-30 type:bug bugzilla:400502
 Patch6:       gnome-volume-manager-06-no-linux-msg.diff
 URL:          www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build

--- a/patches/gdm-02-branding-general.diff	Thu Jan 25 04:49:00 2007 +0000
+++ b/patches/gdm-02-branding-general.diff	Thu Jan 25 08:02:53 2007 +0000
@@ -146,3 +146,14 @@
  GraphicalThemeDir=@datadir@/gdm/themes/
  GraphicalThemeRand=false
  
+diff -urN gdm-2.14.6/gui/gdmphotosetup.desktop.in gdm-2.14.6-hacked/gui/gdmphotosetup.desktop.in
+--- gdm-2.14.6/gui/gdmphotosetup.desktop.in	2003-07-27 06:57:15.000000000 +1200
++++ gdm-2.14.6-hacked/gui/gdmphotosetup.desktop.in	2006-05-19 15:06:31.405523000 +1200
+@@ -9,6 +9,7 @@
+ StartupNotify=true
+ Terminal=false
+ Type=Application
++NoDisplay=true
+ Categories=Application;Settings;AdvancedSettings;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gdm

--- a/patches/gdm-06-login-photo-menu.diff	Thu Jan 25 04:49:00 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-diff -urN gdm-2.14.6/gui/gdmphotosetup.desktop.in gdm-2.14.6-hacked/gui/gdmphotosetup.desktop.in
---- gdm-2.14.6/gui/gdmphotosetup.desktop.in	2003-07-27 06:57:15.000000000 +1200
-+++ gdm-2.14.6-hacked/gui/gdmphotosetup.desktop.in	2006-05-19 15:06:31.405523000 +1200
-@@ -9,6 +9,7 @@
- StartupNotify=true
- Terminal=false
- Type=Application
-+NoDisplay=true
- Categories=Application;Settings;AdvancedSettings;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gdm

--- a/patches/gimp-02-fixcompile.diff	Thu Jan 25 04:49:00 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
---- gimp-2.3.9/libgimp/gimp.c-orig	2006-06-23 17:41:52.459680000 -0500
-+++ gimp-2.3.9/libgimp/gimp.c	2006-06-23 17:43:27.010326000 -0500
-@@ -22,6 +22,7 @@
- #include "config.h"
- 
- #define _GNU_SOURCE  /* for the sigaction stuff */
-+#define __EXTENSIONS__
- 
- #include <errno.h>
- #include <stdarg.h>
---- gimp-2.3.9/app/main.c-orig	2006-06-23 17:51:04.746071000 -0500
-+++ gimp-2.3.9/app/main.c	2006-06-23 17:51:12.581709000 -0500
-@@ -19,6 +19,7 @@
- #include "config.h"
- 
- #define _GNU_SOURCE  /* for the sigaction stuff */
-+#define __EXTENSIONS__
- 
- #include <stdio.h>
- #include <stdlib.h>

--- a/pyspi.spec	Thu Jan 25 04:49:00 2007 +0000
+++ b/pyspi.spec	Thu Jan 25 08:02:53 2007 +0000
@@ -20,8 +20,10 @@
 Vendor:       Sun Microsystems, Inc.
 Summary:      Python bindings for CSPI
 Source:       http://people.redhat.com/zcerza/dogtail/releases/%{name}-%{version}.tar.gz
-# date:2006-10-07 owner:yippi type:bug
-# can get rid of this when Xorg 7.2 integrates?
+# date:2006-10-07 owner:yippi type:feature
+# This patch is a temporary hack because we currently don't ship Xorg pc
+# files into Solaris.  This will be fixed when Xorg 7.2 integrates and this
+# patch can go away.
 Patch1:       pyspi-01-solaris.diff
 URL:          http://gnome.org/projects/pyspi
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build