--- a/ChangeLog	Tue Jun 17 14:52:27 2008 +0000
+++ b/ChangeLog	Tue Jun 17 15:14:31 2008 +0000
@@ -1,3 +1,13 @@
+2008-06-17  Damien Carbery <[email protected]>
+
+	* base-specs/gnome-settings-daemon.spec: Bump to 2.23.4. Remove
+	  upstream patch, 08-esound-prefix-branding.
+	* patches/gnome-settings-daemon-08-esound-prefix-branding.diff: Removed
+	  upstream.
+	* base-specs/gnome-desktop.spec, base-specs/libgweather.spec, 
+	  base-specs/gnome-menus.spec, base-specs/libwnck.spec: Bump to 2.23.4.
+	* patches/gnome-desktop-01-jds-about-branding.diff: Rework.
+
 2008-06-17  Damien Carbery <[email protected]>
 
 	* base-specs/gnome-terminal.spec: Bump to 2.23.4.1.

--- a/base-specs/gnome-desktop.spec	Tue Jun 17 14:52:27 2008 +0000
+++ b/base-specs/gnome-desktop.spec	Tue Jun 17 15:14:31 2008 +0000
@@ -11,7 +11,7 @@
 Name:         gnome-desktop
 License:      LGPL
 Group:        System/Libraries/GNOME
-Version:      2.23.3
+Version:      2.23.4
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -184,6 +184,8 @@
 %{_libdir}/libgnome-desktop-2.so
 
 %changelog
+* Tue Jun 17 2008 - [email protected]
+- Bump to 2.23.4.
 * Wed Jun 04 2008 - [email protected]
 - Bump to 2.23.3.
 * Thu May 29 2008 - [email protected]

--- a/base-specs/gnome-menus.spec	Tue Jun 17 14:52:27 2008 +0000
+++ b/base-specs/gnome-menus.spec	Tue Jun 17 15:14:31 2008 +0000
@@ -9,7 +9,7 @@
 Name:			gnome-menus
 License:		LGPL
 Group:			System/GUI/GNOME
-Version:		2.23.3
+Version:		2.23.4
 Release:		1
 Distribution:		Java Desktop System
 Vendor:			Sun Microsystems, Inc.
@@ -152,6 +152,9 @@
 %{_includedir}/gnome-menus/*
 
 %changelog
+* Tue Jun 17 2008 - [email protected]
+- Bump to 2.23.4.
+
 * Fri Jun 06 2008 - [email protected]
 - Fixes broken download link.
 

--- a/base-specs/gnome-settings-daemon.spec	Tue Jun 17 14:52:27 2008 +0000
+++ b/base-specs/gnome-settings-daemon.spec	Tue Jun 17 15:14:31 2008 +0000
@@ -11,7 +11,7 @@
 Name:         gnome-settings-daemon
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.23.3
+Version:      2.23.4
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -36,8 +36,6 @@
 Patch6:       gnome-settings-daemon-06-xft.diff
 # date:2008-02-15 owner:dcarbery type:bug bugzilla:??????
 Patch7:       gnome-settings-daemon-07-uninstalled.diff
-# date:2008-05-06 owner:lin type:branding bugster:6653199
-Patch8:       gnome-settings-daemon-08-esound-prefix-branding.diff
 
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -103,7 +101,6 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 # Rename dir so that #include does not have to change on gnome-control-center.
 # Combines with patch mv-src-dir.diff (see bugzilla 511820).
@@ -215,6 +212,8 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Jun 17 2008 - [email protected]
+- Bump to 2.23.4. Remove upstream patch, 08-esound-prefix-branding.
 * Wed Jun 04 2008 - [email protected]
 - Bump to 2.23.3. Remove upstream patch, 08-gnomeinit. Renumber remainder.
 * Fri May 30 - [email protected]

--- a/base-specs/libgweather.spec	Tue Jun 17 14:52:27 2008 +0000
+++ b/base-specs/libgweather.spec	Tue Jun 17 15:14:31 2008 +0000
@@ -11,7 +11,7 @@
 Name:         libgweather
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.23.3
+Version:      2.23.4
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -72,6 +72,8 @@
 
 
 %changelog
+* Tue Jun 17 2008 - [email protected]
+- Bump to 2.23.4.
 * Wed Jun 04 2008 - [email protected]
 - Bump to 2.23.3.
 * Wed May 28 2008 - [email protected]

--- a/base-specs/libwnck.spec	Tue Jun 17 14:52:27 2008 +0000
+++ b/base-specs/libwnck.spec	Tue Jun 17 15:14:31 2008 +0000
@@ -11,12 +11,12 @@
 Name:         libwnck
 License:      GPL
 Group:        System/Libraries/GNOME
-Version:      2.22.1
+Version:      2.23.4
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      Window Navigator Construction Kit Library
-Source:       http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.22/libwnck-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.23/libwnck-%{version}.tar.bz2
 Source1:      %{name}-po-sun-%{po_sun_version}.tar.bz2
 %if %build_l10n
 Source2:                 l10n-configure.sh
@@ -119,6 +119,8 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Jun 17 2008 - [email protected]
+- Bump to 2.23.4.
 * Fri May 16 2008 - [email protected]
 - remove conditional build of tx patch
 * Wed Apr 09 2008 - [email protected]

--- a/patches/gnome-desktop-01-jds-about-branding.diff	Tue Jun 17 14:52:27 2008 +0000
+++ b/patches/gnome-desktop-01-jds-about-branding.diff	Tue Jun 17 15:14:31 2008 +0000
@@ -11,7 +11,7 @@
  SUBDIRS =			\
  	po 			\
  	libgnome-desktop 	\
-@@ -11,8 +16,8 @@
+@@ -16,14 +16,12 @@
  
  EXTRA_DIST =			\
  	MAINTAINERS		\
@@ -21,9 +21,6 @@
 +	$(XML_FILES)		\
  	COPYING-DOCS		\
  	HACKING			\
- 	intltool-extract.in	\
-@@ -20,8 +25,6 @@
- 	intltool-update.in	\
  	gnome-doc-utils.make
  
 -versiondir=$(datadir)/gnome-about

--- a/patches/gnome-settings-daemon-08-esound-prefix-branding.diff	Tue Jun 17 14:52:27 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
---- gnome-settings-daemon-2.22.0/configure.ac-orig	2008-05-06 19:55:25.326406000 -0500
-+++ gnome-settings-daemon-2.22.0/configure.ac	2008-05-06 19:55:50.855161000 -0500
-@@ -251,6 +251,16 @@ fi
- AC_SUBST(ESD_CFLAGS)
- AC_SUBST(ESD_LIBS)
- 
-+GSD_ESD_LOCATION=`pkg-config esound --variable=esd_serverdir`
-+if test x"$GSD_ESD_LOCATION" != "x"; then
-+    # Add slash, so that if the ESD pkgconfig file does not
-+    # specify esd_serverdir, the tools/Makefile.am file will look
-+    # in the PATH for the daemon, as was previous behavior.
-+    #
-+    GSD_ESD_LOCATION="$GSD_ESD_LOCATION/"
-+fi
-+AC_SUBST(GSD_ESD_LOCATION) 
-+
- dnl ==============================================
- dnl GStreamer section
- dnl ==============================================
---- gnome-settings-daemon-2.22.0/plugins/sound/Makefile.am-orig	2008-05-06 19:56:03.066418000 -0500
-+++ gnome-settings-daemon-2.22.0/plugins/sound/Makefile.am	2008-05-06 19:56:17.752372000 -0500
-@@ -16,6 +16,7 @@ libsound_la_CPPFLAGS = \
- 	$(AM_CPPFLAGS)
- 
- libsound_la_CFLAGS = \
-+	-DGSD_ESD_LOCATION=\"$(GSD_ESD_LOCATION)\" \
- 	$(SETTINGS_PLUGIN_CFLAGS)	\
- 	$(GNOME_CFLAGS)			\
- 	$(ESD_CFLAGS)			\
---- gnome-settings-daemon-2.22.2/plugins/sound/gsd-sound-manager.orig	2008-05-06 19:56:33.125017000 -0500
-+++ gnome-settings-daemon-2.22.2/plugins/sound/gsd-sound-manager.c	2008-05-06 19:56:54.107435000 -0500
-@@ -96,7 +96,7 @@
- static gboolean
- start_gnome_sound (GsdSoundManager *manager)
- {
--        char    *argv[] = { "esd", "-nobeeps", NULL};
-+        char    *argv[] = { GSD_ESD_LOCATION "esd", "-nobeeps", NULL};
-         GError  *error;
-         gboolean res;
-         time_t   starttime;