2.21.2gnome-applets-2_21_2-1_fc9

2 files changed, 67 insertions, 11 deletions

diff --git a/gnome-applets-null-battstat.patch b/gnome-applets-null-battstat.patch
new file mode 100644
index 0000000..95e4573
--- /dev/null
+++ b/gnome-applets-null-battstat.patch
@@ -0,0 +1,55 @@
+diff -up gnome-applets-2.21.2/null_applet/Makefile.am.battstat gnome-applets-2.21.2/null_applet/Makefile.am
+--- gnome-applets-2.21.2/null_applet/Makefile.am.battstat	2007-12-06 22:43:35.000000000 -0500
++++ gnome-applets-2.21.2/null_applet/Makefile.am	2007-12-06 22:43:43.000000000 -0500
+@@ -9,12 +9,17 @@ null_applet_SOURCES = null_applet.c
+ 
+ null_applet_LDADD = $(GNOME_APPLETS_LIBS)
+ 
++if !BUILD_BATTSTAT_APPLET
++battstat_applet=GNOME_BattstatApplet.server.in
++endif
++
+ serverdir = $(libdir)/bonobo/servers
+ server_in_files =				\
+ 	GNOME_NullApplet_Factory.server.in	\
+ 	GNOME_CDPlayerApplet.server.in		\
+ 	GNOME_MailcheckApplet_Factory.server.in	\
+-	GNOME_Panel_WirelessApplet.server.in
++	GNOME_Panel_WirelessApplet.server.in	\
++	$(battstat_applet)
+ server_DATA = $(server_in_files:.server.in=.server)
+ 
+ @INTLTOOL_SERVER_RULE@
+@@ -28,4 +33,5 @@ EXTRA_DIST =					\
+ 	GNOME_NullApplet_Factory.server.in.in	\
+ 	GNOME_CDPlayerApplet.server.in		\
+ 	GNOME_MailcheckApplet_Factory.server.in	\
+-	GNOME_Panel_WirelessApplet.server.in
++	GNOME_Panel_WirelessApplet.server.in	\
++	GNOME_BattstatApplet.server.in
+diff -up gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in.battstat gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in
+--- gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in.battstat	2007-12-06 22:44:07.000000000 -0500
++++ gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in	2007-12-06 22:43:54.000000000 -0500
+@@ -0,0 +1,22 @@
++<oaf_info>
++
++<oaf_server iid="OAFIID:GNOME_BattstatApplet"
++	    type="factory" 
++	    location="OAFIID:GNOME_NullApplet_Factory">
++
++	<oaf_attribute name="repo_ids" type="stringv">
++		<item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
++		<item value="IDL:Bonobo/Control:1.0"/>
++		<item value="IDL:Bonobo/Unknown:1.0"/>
++	</oaf_attribute>
++	<oaf_attribute name="name" type="string" _value="Battery Charge Monitor"/>
++	<oaf_attribute name="description" type="string" _value="Monitor a laptop's remaining power"/>
++	<oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
++        <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
++        <oaf_attribute name="bugzilla:component" type="string" value="battery"/>
++        <oaf_attribute name="bugzilla:other_binaries" type="string" value="battstat-applet-2"/>
++
++
++</oaf_server>
++
++</oaf_info>
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 0f35e13..d2ebde5 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -72,6 +72,9 @@ Patch35:	gnome-applets-2.21.1-mixer-sync.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=488824
 Patch39:	gweather-network.patch
 
+# do the nullapplet dance for battstat
+Patch40:	gnome-applets-null-battstat.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -173,6 +176,7 @@ libraries contained in the gnome-applets package.
 %patch33 -p1 -b .node-leak
 %patch35 -p1 -b .mixer-sync
 %patch39 -p1 -b .geweather-network
+%patch40 -p1 -b .battstat-null
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -194,6 +198,7 @@ autoreconf
 %if %{build_stickynotes}
 	--enable-stickynotes	\
 %endif
+	--disable-battstat	\
 	--disable-scrollkeeper 	\
 	--enable-mini-commander 
 make
@@ -213,13 +218,8 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 # Clean up unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libgweather.la
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libgweather.a
-
-desktop-file-install --vendor gnome --delete-original       \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-only-show-in GNOME                                  \
-  $RPM_BUILD_ROOT%{_datadir}/applications/*
+rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.a
 
 # usermode-ify cpufreq-selector
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
@@ -246,7 +246,6 @@ fi
 
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule                                        \
-	    %{_sysconfdir}/gconf/schemas/battstat.schemas                  \
 	    %{_sysconfdir}/gconf/schemas/charpick.schemas                  \
 	    %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas            \
 	    %{_sysconfdir}/gconf/schemas/drivemount.schemas                \
@@ -279,13 +278,16 @@ if [ "$1" -gt 1 ]; then
 	    %{_sysconfdir}/gconf/schemas/stickynotes.schemas               \
 %endif
 	    %{_sysconfdir}/gconf/schemas/multiload.schemas >& /dev/null || :
+  if [ -f %{_sysconfdir}/gconf/schemas/battstat.schemas ]; then
+    gconftool-2 --makefile-uninstall-rule 				\
+	    %{_sysconfdir}/gconf/schemas/battstat.schemas
+  fi
 fi
 
 %preun
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule                                    \
-	    %{_sysconfdir}/gconf/schemas/battstat.schemas                  \
 	    %{_sysconfdir}/gconf/schemas/charpick.schemas                  \
 	    %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas            \
 	    %{_sysconfdir}/gconf/schemas/drivemount.schemas                \
@@ -326,7 +328,6 @@ fi
 %{python_sitelib}/invest/
 %{_libdir}/libgweather.so.*
 %{_libexecdir}/accessx-status-applet
-%{_libexecdir}/battstat-applet-2
 %{_libexecdir}/charpick_applet2
 %{_libexecdir}/cpufreq-applet
 %{_libexecdir}/drivemount_applet2
@@ -350,7 +351,6 @@ fi
 %{_sysconfdir}/gconf/schemas/*
 %{_sysconfdir}/pam.d/*
 %{_sysconfdir}/security/console.apps/*
-%{_sysconfdir}/sound/events/*
 
 %files devel
 %defattr(-,root,root)
@@ -361,6 +361,7 @@ fi
 %changelog
 * Wed Dec  5 2007 Matthias Clasen <mclasen@redhat.com> - 1:2.21.2-1
 - Update to 2.21.2
+- Drop the battstat applet 
 
 * Mon Oct 29 2007 Matthias Clasen <mclasen@redhat.com> - 1:2.20.0-10
 - Fix a number of problems in the weather applet