rpms/control-center/devel control-center.spec, 1.422, 1.423 gcc-sound-props-remove-oss.patch, 1.1, NONE

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2810

Modified Files:
	control-center.spec 
Removed Files:
	gcc-sound-props-remove-oss.patch 
Log Message:
* Thu Dec 18 2008 - Bastien Nocera <bnocera at redhat.com> - 2.25.2-9
- Remove the sound capplet by hand, will be gone in the next upstream version



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -r1.422 -r1.423
--- control-center.spec	18 Dec 2008 03:47:02 -0000	1.422
+++ control-center.spec	18 Dec 2008 16:02:00 -0000	1.423
@@ -22,7 +22,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.25.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -38,9 +38,6 @@
 # minor build breakage in gtk, will be fixed in the next gtk release
 Patch8: gtkmarshal.patch
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=466342
-Patch10: gcc-sound-props-remove-oss.patch
-
 # http://bugzilla.gnome.org/show_bug.cgi?id=545075 
 Patch22: slab-icon-names.patch
 
@@ -171,7 +168,6 @@
 popd
 %patch3 -p1 -b .no-gnome-common
 %patch8 -p1 -b .gtkmarshal
-%patch10 -p0 -b .no-oss
 %patch22 -p0 -b .slab-icon-names
 %patch25 -p1 -b .ta-schema
 %patch30 -p1 -b .default-layout-toggle
@@ -246,6 +242,13 @@
 # remove useless libtool archive files
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
+# And until we get a new g-c-c package without the sound capplet,
+# remove those by hand.
+rm $RPM_BUILD_ROOT%{_bindir}/gnome-sound-properties			\
+	%{_datadir}/applications/gnome-settings-sound.desktop		\
+	%{_datadir}/gnome-control-center/glade/sound-properties.glade	\
+	%{_datadir}/icons/hicolor/*/apps/gnome-sound-properties.*
+
 %find_lang %{gettext_package} --all-name --with-gnome
 
 %clean
@@ -325,7 +328,6 @@
 %{_bindir}/gnome-keyboard-properties
 %{_bindir}/gnome-mouse-properties
 %{_bindir}/gnome-network-preferences
-%{_bindir}/gnome-sound-properties
 %{_bindir}/gnome-typing-monitor
 %{_bindir}/gnome-window-properties
 %{_bindir}/gnome-font-viewer
@@ -351,6 +353,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Thu Dec 18 2008 - Bastien Nocera <bnocera at redhat.com> - 2.25.2-9
+- Remove the sound capplet by hand, will be gone in the next upstream version
+
 * Wed Dec 17 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.2-8
 - Rebuild against new gnome-desktop
 


--- gcc-sound-props-remove-oss.patch DELETED ---