--- a/ChangeLog	Fri Apr 13 17:27:25 2007 +0000
+++ b/ChangeLog	Sun Apr 15 05:51:22 2007 +0000
@@ -1,3 +1,9 @@
+2007-04-15  Wang Xin <[email protected]>
+
+	* SUNWgnome-applets.spec: Enable battstat on sparc platform.
+	* patches/gnome-applets--05-battstat.diff: Remove unnecessary
+	%ifarch i386.
+
 2007-04-13  Dermot McCluskey <[email protected]>
 
 	* base-specs/acroread.spec: add private libz.  Fixes 6488257

--- a/SUNWgnome-applets.spec	Fri Apr 13 17:27:25 2007 +0000
+++ b/SUNWgnome-applets.spec	Sun Apr 15 05:51:22 2007 +0000
@@ -574,9 +574,7 @@
 %{_libdir}/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
 %{_libdir}/bonobo/servers/Deskbar_Applet.server
 %{_libdir}/bonobo/servers/GNOME_WebEyes.server
-%ifarch i386
 %{_libdir}/bonobo/servers/GNOME_BattstatApplet.server
-%endif
 %{_libdir}/deskbar-applet
 %{_libdir}/python?.?/vendor-packages
 %{_libexecdir}/charpick_applet2
@@ -584,9 +582,7 @@
 %{_libexecdir}/accessx-status-applet
 %{_libexecdir}/quick-lounge-applet
 %{_libexecdir}/multiload-applet-2
-%ifarch i386
 %{_libexecdir}/battstat-applet-2
-%endif
 %dir %attr(0755, root, sys) %{_datadir}
 %dir %attr (0755, root, other) %{_datadir}/gnome
 %{_datadir}/gnome/help/char-palette/C
@@ -596,14 +592,10 @@
 %{_datadir}/gnome/help/quick-lounge/C
 %{_datadir}/gnome/help/multiload/C
 %{_datadir}/gnome/help/trashapplet/C
-%ifarch i386
 %{_datadir}/gnome/help/battstat/C
-%endif
 %{_datadir}/gnome-applets/glade/stickynotes*.glade
 %{_datadir}/gnome-applets/glade/trashapplet.glade
-%ifarch i386
 %{_datadir}/gnome-applets/glade/battstat_applet.glade
-%endif
 %dir %attr (0755, root, other) %{_datadir}/pixmaps
 %{_datadir}/pixmaps/accessx-status-applet
 %{_datadir}/pixmaps/stickynotes
@@ -614,18 +606,14 @@
 %{_datadir}/omf/quick-lounge-applet/quick-lounge-C.omf
 %{_datadir}/omf/trashapplet/trashapplet-C.omf
 %{_datadir}/omf/multiload/multiload-C.omf
-%ifarch i386
 %{_datadir}/omf/battstat/battstat-C.omf
-%endif
 %{_datadir}/gnome-2.0/ui/GNOME_CharpickerApplet.xml
 %{_datadir}/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
 %{_datadir}/gnome-2.0/ui/GNOME_AccessxApplet.xml
 %{_datadir}/gnome-2.0/ui/GNOME_QuickLoungeApplet.xml
 %{_datadir}/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml
 %{_datadir}/gnome-2.0/ui/GNOME_MultiloadApplet.xml
-%ifarch i386
 %{_datadir}/gnome-2.0/ui/GNOME_BattstatApplet.xml
-%endif
 %dir %attr (-, root, other) %{_datadir}/icons
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/16x16
@@ -664,10 +652,8 @@
 %{_sysconfdir}/gconf/schemas/quick-lounge.schemas
 %{_sysconfdir}/gconf/schemas/deskbar-applet.schemas
 %{_sysconfdir}/gconf/schemas/multiload.schemas
-%ifarch i386
 %{_sysconfdir}/gconf/schemas/battstat.schemas
 %{_sysconfdir}/sound/events/battstat_applet.soundlist
-%endif
 
 %files -n SUNWgnome-utility-applets-devel
 %defattr (-, root, bin)
@@ -696,6 +682,8 @@
 # %{_datadir}/omf/gnome-netstatus/*-[a-z][a-z]_*.omf
 
 %changelog
+* Sun Apr 15 2007 - [email protected]
+- Ship battstat applet on sparc.
 * Wed Mar 07 2007 - [email protected]
 - Delete en_GB locale files in %install as it breaks SUNWzz-gnome-l10n build. 
 * Mon Feb 19 2007 - [email protected]

--- a/patches/gnome-applets-05-battstat.diff	Fri Apr 13 17:27:25 2007 +0000
+++ b/patches/gnome-applets-05-battstat.diff	Sun Apr 15 05:51:22 2007 +0000
@@ -76,7 +76,7 @@
  	   fi
  
  	   ;;
-+       i386-*-solaris*)
++       *-*-solaris*)
 +          if test "x$HAVE_HAL" = "xno"; then
 +             echo "warning: ${host} is not supported by battstat_applet, not building" >&2
 +             build_battstat_applet=no