- Remove the mixer applet

1 files changed, 13 insertions, 5 deletions

diff --git a/gnome-applets.spec b/gnome-applets.spec
index 17bd72c..58c2721 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.25.1
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -63,6 +63,8 @@ Patch39:	gweather-network.patch
 
 # do the nullapplet dance for battstat
 Patch40:	gnome-applets-null-battstat.patch
+# and for the mixer applet
+Patch42:	gnome-applets-remove-mixer.patch
 
 # from upstream
 Patch41: 	gnome-applets-libgnomeui.patch
@@ -152,6 +154,9 @@ and more.
 %patch33 -p1 -b .node-leak
 %patch39 -p1 -b .gweather-network
 %patch40 -p1 -b .battstat-null
+mv mixer/GNOME_MixerApplet.server.in.in null_applet/GNOME_MixerApplet.server.in
+rm -rf mixer/
+%patch42 -p0 -b .mixer-null
 
 # We don't ship gnome-system-tools
 rm -rf modemlights
@@ -245,7 +250,6 @@ gconftool-2 --makefile-install-rule                                        \
 	    %{_sysconfdir}/gconf/schemas/gweather.schemas                  \
 	    %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas     \
 	    %{_sysconfdir}/gconf/schemas/mini-commander.schemas            \
-	    %{_sysconfdir}/gconf/schemas/mixer.schemas                     \
 	    %{_sysconfdir}/gconf/schemas/modemlights.schemas               \
 %if %{build_stickynotes}
 	    %{_sysconfdir}/gconf/schemas/stickynotes.schemas               \
@@ -266,7 +270,6 @@ if [ "$1" -gt 1 ]; then
 	    %{_sysconfdir}/gconf/schemas/gweather.schemas                  \
 	    %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas     \
 	    %{_sysconfdir}/gconf/schemas/mini-commander.schemas            \
-	    %{_sysconfdir}/gconf/schemas/mixer.schemas                     \
 	    %{_sysconfdir}/gconf/schemas/modemlights.schemas               \
 %if %{build_stickynotes}
 	    %{_sysconfdir}/gconf/schemas/stickynotes.schemas               \
@@ -276,6 +279,10 @@ if [ "$1" -gt 1 ]; then
     gconftool-2 --makefile-uninstall-rule 				\
 	    %{_sysconfdir}/gconf/schemas/battstat.schemas >& /dev/null || :
   fi
+  if [ -f %{_sysconfdir}/gconf/schemas/mixer.schemas ]; then
+     gconftool-2 --makefile-uninstall-rule 				\
+     	     %{_sysconfdir}/gconf/schemas/mixer.schemas >& /dev/null || :
+  fi
 fi
 
 %preun
@@ -289,7 +296,6 @@ if [ "$1" -eq 0 ]; then
 	    %{_sysconfdir}/gconf/schemas/gweather.schemas                  \
 	    %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas     \
 	    %{_sysconfdir}/gconf/schemas/mini-commander.schemas            \
-	    %{_sysconfdir}/gconf/schemas/mixer.schemas                     \
 	    %{_sysconfdir}/gconf/schemas/modemlights.schemas               \
 %if %{build_stickynotes}
 	    %{_sysconfdir}/gconf/schemas/stickynotes.schemas               \
@@ -329,7 +335,6 @@ fi
 %{_libexecdir}/gnome-keyboard-applet
 %{_libexecdir}/gweather-applet-2
 %{_libexecdir}/mini_commander_applet
-%{_libexecdir}/mixer_applet2
 %{_libexecdir}/modemlights_applet2
 %{_libexecdir}/multiload-applet-2
 %{_libexecdir}/null_applet
@@ -346,6 +351,9 @@ fi
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Fri Dec 19 2008 - Bastien Nocera <bnocera@redhat.com> - 1:2.25.1-7
+- Remove the mixer applet
+
 * Fri Dec 19 2008 Matthias Clasen <mclasen@redhat.com> - 1:2.25.1-5
 - Fix the build