--- a/gnome-applets.spec	Tue Dec 16 04:13:19 2003 +0000
+++ b/gnome-applets.spec	Tue Dec 16 04:50:04 2003 +0000
@@ -1,25 +1,24 @@
 Name:         gnome-applets 
 License:      GPL
 Group:        System/GUI/GNOME 
-Version:      2.4.1
+Version:      2.5.2
 Release:      1
 Distribution: Mercury
 Vendor:	      Sun Microsystems, Inc.
 Summary:      GNOME Applets
-Source:       http://ftp.gnome.org/pub/GNOME/sources/gnome-applets/2.3/gnome-applets-%{version}.tar.bz2 
-Source1:      accessx-status-applet.png
-Source2:      gnome-applets-l10n-po.tar.bz2
-Source3:      gnome-mixer.png
-Source4:      gnome-applets_docs-0.1.tar.bz2
-Patch1:       gnome-applets-01-potfiles_in.diff
+Source:       http://ftp.gnome.org/pub/GNOME/sources/gnome-applets/2.5/gnome-applets-%{version}.tar.bz2 
+Source1:      gnome-applets-l10n-po-0.6.tar.bz2
+Source2:      gnome-mixer.png
+Source3:      gnome-applets_docs-0.1.tar.bz2
+Patch1:       gnome-applets-01-potfiles.diff
 Patch2:       gnome-applets-02-battstat-suspend.diff
 Patch3:       gnome-applets-03-stickynotes-icon.diff
 Patch4:       gnome-applets-04-geyes-themes.diff
 Patch5:       gnome-applets-05-gkb-window-icon-current.diff
 Patch6:       gnome-applets-06-mount-floppy-location.diff
 Patch7:       gnome-applets-07-mini-commander-filesel.diff
-Patch8:       gnome-applets-08-cd-player-stop-playing.diff
-Patch9:       gnome-applets-09-accessx-status-crash.diff
+Patch8:       gnome-applets-08-add-l10n-docs.diff
+Patch9:       gnome-applets-09-battstat-yelp-crash.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/gnome-applets
@@ -55,10 +54,9 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-cp %SOURCE1 accessx-status/pixmaps
-tar jxvf %SOURCE2
-cp %SOURCE3 mixer/gnome-mixer-applet.png
-tar jxvf %SOURCE4
+tar jxvf %SOURCE1
+cp %SOURCE2 mixer/gnome-mixer-applet.png
+tar jxvf %SOURCE3
 
 %build
 libtoolize --force
@@ -77,7 +75,11 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 
 make DESTDIR=$RPM_BUILD_ROOT install
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
+#Copy zh_HK from zh_TW
+#Fixes bug 4930405
+install -d $RPM_BUILD_ROOT/usr/share/locale/zh_HK/LC_MESSAGES
+install --mode=0644 $RPM_BUILD_ROOT/usr/share/locale/zh_TW/LC_MESSAGES/*.mo $RPM_BUILD_ROOT/usr/share/locale/zh_HK/LC_MESSAGES/
+                                                                                                                                                             
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -143,6 +145,8 @@
 %{_libexecdir}/*
 
 %changelog
+* Tue Dec 16 2003 - <[email protected]>
+- Bump to 2.5.2
 * Thu Oct 23 2003 - <[email protected]>
 - #4942358 patch 09
 * Tue Oct 14 2003 - <[email protected]>