--- a/control-center.spec	Sat Oct 18 09:56:44 2003 +0000
+++ b/control-center.spec	Mon Oct 20 01:05:29 2003 +0000
@@ -1,34 +1,22 @@
 Name:         control-center
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.2.2
-Release:      33
+Version:      2.4.0
+Release:      1
 Distribution: Mercury
 Vendor:       Sun Microsystems, Inc.
-Summary:      The GNOME control center for GNOME 2.2
-Source:       http://ftp.gnome.org/pub/GNOME/sources/control-center/2.2/control-center-%{version}.tar.bz2
-Source1:      display-capplet.png
-Source2:      gnome-ccthemes.png
-Source3:      gnome-keyboard-layout.png
-Patch1:       control-center-01-theme-failsafe.diff
-Patch2:	      control-center-02-default-applications-icon.diff
-Patch3:	      control-center-03-display-properties-capplet.diff
-Patch4:	      control-center-04-sound-theme-menu-icons.diff
-Patch5:       control-center-05-gnome-keyboard-layout.diff
-Patch6:       control-center-06-potfiles_in.diff
-Patch7:       control-center-07-fonts-folder.diff
-Patch8:       control-center-08-window-icon-themes.diff
-Patch9:       control-center-09-filetypes-menu-proxy-icon.diff
-Patch10:      control-center-10-desktop-keys-binding.diff
-Patch11:      control-center-11-settings-menu-reorder.diff
-Patch12:      control-center-12-capplet-titles.diff
-Patch13:      control-center-13-network-proxy-password.diff
-Patch14:      control-center-14-menu-entries.diff
-Patch15:      control-center-15-x-cursor-theme.diff
-Patch16:      control-center-16-schema-default.diff
-Patch17:      control-center-17-locate-cursor-multihead.diff
-Patch18:      control-center-18-window-help.diff
-Patch19:      control-center-19-keybindings-close.diff
+Summary:      The GNOME control center for GNOME 2.4
+Source:       http://ftp.gnome.org/pub/GNOME/sources/control-center/2.4/control-center-%{version}.tar.bz2
+Source1:      gnome-keyboard-layout.png
+Patch1:       control-center-01-gnome-keyboard-layout.diff
+Patch2:       control-center-02-potfiles.diff
+Patch3:       control-center-03-window-icon-themes.diff
+Patch4:       control-center-04-filetypes-menu-proxy-icon.diff
+Patch5:       control-center-05-settings-menu-reorder.diff
+Patch6:       control-center-06-capplet-titles.diff
+Patch7:       control-center-07-menu-entries.diff
+Patch8:       control-center-08-window-help.diff
+Patch9:       control-center-09-keybindings-close.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/control-center2
@@ -36,9 +24,9 @@
 Prereq:       /sbin/ldconfig
 Prereq:       scrollkeeper
 
-%define libgnomeui_version 2.2.0
+%define libgnomeui_version 2.4.0
 %define esound_version 0.2.28
-%define gnome_desktop_version 2.2.1
+%define gnome_desktop_version 2.4.0
 %define metacity_version 2.4.34
 
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -63,19 +51,8 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-cp %SOURCE1 capplets/display
-cp %SOURCE2 capplets/theme-switcher
-cp %SOURCE3 capplets/gnome-keyboard-layout
+
+cp %SOURCE1 capplets/gnome-keyboard-layout
 
 %build
 libtoolize --force
@@ -128,6 +105,9 @@
 %{_libdir}/window-manager-settings/*.so*
 
 %changelog
+* Mon Oct 19 2003 - [email protected]
+- New tarball, bump version, reset release
+
 * Thu Aug 14 2003 - <[email protected]>
 - remove *.a, *.la