Fri Nov 17 15:24:06 UTC 2006

Author: rstrode

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12943

Modified Files:
	control-center-2.15.91-fix-thumbnailing.patch 
	control-center.spec 
Added Files:
	control-center-2.17.1-default-apps.patch 
	control-center-2.17.1-fix-media-keys.patch 
Removed Files:
	control-center-2.10.1-mark-tool-buttons-important.patch 
	control-center-2.12.0-run-power-manager.patch 
	control-center-2.13.90-fedora-apps.patch 
	control-center-2.15.4-add-dbus-flags.patch 
	control-center-2.15.92-fix-media-keys.patch 
	control-center-2.16.0-default-applications-browser-fixes.patch 
	control-center-2.16.0-fedora-apps.patch 
	keyboard-drawing-focus.patch 
Log Message:
- Drop unused/bogus patches
- Try to fix up background capplet thumbnail code again (better this time)
- rearrange patches so that vendor patches end up at the end


control-center-2.17.1-default-apps.patch:
 gnome-default-applications.xml.in |  131 ++++++++++----------------------------
 1 files changed, 35 insertions(+), 96 deletions(-)

--- NEW FILE control-center-2.17.1-default-apps.patch ---
--- control-center-2.17.1/capplets/default-applications/gnome-default-applications.xml.in.default-apps	2006-05-14 16:48:24.000000000 -0400
+++ control-center-2.17.1/capplets/default-applications/gnome-default-applications.xml.in	2006-11-16 15:03:43.000000000 -0500
@@ -44,42 +44,12 @@
       <win-command>galeon -w %s</win-command>
     </web-browser>
     <web-browser>
-      <_name>Encompass</_name>
-      <executable>encompass</executable>
-      <command>encompass %s</command>
-      <icon-name>encompass</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>false</netscape-remote>
-    </web-browser>
-    <web-browser>
-      <_name>Firebird</_name>
-      <executable>mozilla-firebird</executable>
-      <command>mozilla-firebird %s</command>
-      <icon-name></icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>mozilla-firebird -remote "openurl(%s,new-tab)"</tab-command>
-      <win-command>mozilla-firebird -remote "openurl(%s,new-window)"</win-command>
-    </web-browser>
-    <web-browser>
       <_name>Firefox</_name>
       <executable>firefox</executable>
       <command>firefox %s</command>
       <icon-name>firefox</icon-name>
       <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>firefox -remote "openurl(%s,new-tab)"</tab-command>
-      <win-command>firefox -remote "openurl(%s,new-window)"</win-command>
-    </web-browser>
-    <web-browser>
-      <_name>Mozilla 1.6</_name>
-      <executable>mozilla-1.6</executable>
-      <command>mozilla-1.6 %s</command>
-      <icon-name>mozilla-icon</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>mozilla-1.6 -remote "openurl(%s,new-tab)"</tab-command>
-      <win-command>mozilla-1.6 -remote "openurl(%s,new-window)"</win-command>
+      <netscape-remote>false</netscape-remote>
     </web-browser>
     <web-browser>
       <_name>Mozilla</_name>
@@ -87,19 +57,23 @@
       <command>mozilla %s</command>
       <icon-name>mozilla-icon</icon-name>
       <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>mozilla -remote "openurl(%s,new-tab)"</tab-command>
-      <win-command>mozilla -remote "openurl(%s,new-window)"</win-command>
+      <netscape-remote>false</netscape-remote>
+    </web-browser>
+    <web-browser>
+      <_name>Seamonkey</_name>
+      <executable>seamonkey</executable>
+      <command>seamonkey %s</command>
+      <icon-name>seamonkey-icon</icon-name>
+      <run-in-terminal>false</run-in-terminal>
+      <netscape-remote>false</netscape-remote>
     </web-browser>
     <web-browser>
-      <_name>Netscape Communicator</_name>
+      <_name>Netscape</_name>
       <executable>netscape</executable>
       <command>netscape %s</command>
       <icon-name>netscape</icon-name>
       <run-in-terminal>false</run-in-terminal>
-      <netscape-remote>true</netscape-remote>
-      <tab-command>netscape -remote "openurl(%s,new-tab)"</tab-command>
-      <win-command>netscape -remote "openurl(%s,new-window)"</win-command>
+      <netscape-remote>false</netscape-remote>
     </web-browser>
     <web-browser>
       <_name>Konqueror</_name>
@@ -137,51 +111,9 @@
 
   <mail-readers>
     <mail-reader>
-      <_name>Evolution Mail Reader 2.4</_name>
-      <executable>evolution-2.4</executable>
-      <command>evolution-2.4 %s</command>
-      <icon-name>evolution</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Evolution Mail Reader 2.2</_name>
-      <executable>evolution-2.2</executable>
-      <command>evolution-2.2 %s</command>
-      <icon-name>evolution</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Evolution Mail Reader 2.0</_name>
-      <executable>evolution-2.0</executable>
-      <command>evolution-2.0 %s</command>
-      <icon-name>evolution</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Evolution Mail Reader 1.6</_name>
-      <executable>evolution-1.6</executable>
-      <command>evolution-1.6 %s</command>
-      <icon-name>evolution</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Evolution Mail Reader 1.5</_name>
-      <executable>evolution-1.5</executable>
-      <command>evolution-1.5 %s</command>
-      <icon-name>evolution</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Evolution Mail Reader 1.4</_name>
-      <executable>evolution-1.4</executable>
-      <command>evolution-1.4 %s</command>
-      <icon-name>evolution</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
       <_name>Evolution Mail Reader</_name>
       <executable>evolution</executable>
-      <command>evolution %s</command>
+      <command>evolution --component=mail %s</command>
       <icon-name>evolution</icon-name>
       <run-in-terminal>false</run-in-terminal>
     </mail-reader>
@@ -200,27 +132,13 @@
       <run-in-terminal>false</run-in-terminal>
     </mail-reader>
     <mail-reader>
-      <_name>Thunderbird</_name>
+      <_name>Thunderbird Mail</_name>
       <executable>thunderbird</executable>
       <command>thunderbird -compose %s</command>
       <icon-name>thunderbird</icon-name>
       <run-in-terminal>false</run-in-terminal>
     </mail-reader>
     <mail-reader>
-      <_name>Mozilla Thunderbird</_name>
-      <executable>mozilla-thunderbird</executable>
-      <command>mozilla-thunderbird -compose %s</command>
-      <icon-name>thunderbird</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
-      <_name>Mozilla Mail</_name>
-      <executable>mozilla</executable>
-      <command>mozilla -mail %s</command>
-      <icon-name>mozilla-mail-icon</icon-name>
-      <run-in-terminal>false</run-in-terminal>
-    </mail-reader>
-    <mail-reader>
       <_name>Mutt</_name>
       <executable>mutt</executable>
       <command>mutt %s</command>
@@ -228,6 +146,13 @@
       <run-in-terminal>true</run-in-terminal>
     </mail-reader>
     <mail-reader>
+      <_name>Sylpheed</_name>
+      <executable>sylpheed</executable>
+      <command>sylpheed --compose %s</command>
+      <icon-name>sylpheed</icon-name>
+      <run-in-terminal>false</run-in-terminal>
+    </mail-reader>
+    <mail-reader>
       <_name>Sylpheed-Claws</_name>
       <executable>sylpheed-claws</executable>
       <command>sylpheed-claws --compose %s</command>
@@ -252,6 +177,20 @@
       <exec-flag>-e</exec-flag>
     </terminal>
     <terminal>
+      <_name>KDE Konsole</_name>
+      <executable>konsole</executable>
+      <command>konsole</command>
+      <icon-name>konsole</icon-name>
+      <exec-flag>-e</exec-flag>
+    </terminal>
+    <terminal>
+      <_name>KTerm</_name>
+      <executable>kterm</executable>
+      <command>kterm</command>
+      <icon-name>kterm</icon-name>
+      <exec-flag>-e</exec-flag>
+    </terminal>
+    <terminal>
       <_name>GNOME Terminal</_name>
       <executable>gnome-terminal</executable>
       <command>gnome-terminal</command>

control-center-2.17.1-fix-media-keys.patch:
 control-center-2.15.92/schemas/apps_gnome_settings_daemon_keybindings.schemas.in |   10 +-
 control-center-2.17.1/capplets/keybindings/gnome-keybinding-properties.c         |   40 +++++++---
 control-center-2.17.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c     |    6 +
 3 files changed, 37 insertions(+), 19 deletions(-)

--- NEW FILE control-center-2.17.1-fix-media-keys.patch ---
--- control-center-2.15.92/schemas/apps_gnome_settings_daemon_keybindings.schemas.in.fix-media-keys	2006-08-24 20:38:14.000000000 -0400
+++ control-center-2.15.92/schemas/apps_gnome_settings_daemon_keybindings.schemas.in	2006-08-24 20:39:06.000000000 -0400
@@ -161,7 +161,7 @@
             <key>/schemas/apps/gnome_settings_daemon/keybindings/play</key>
             <applyto>/apps/gnome_settings_daemon/keybindings/play</applyto>
             <type>string</type>
-            <default></default>
+            <default>XF86AudioPlay</default>
             <locale name="C">
                 <short>Play (or play/pause)</short>
                 <long>Play (or play/pause) key's shortcut.</long>
@@ -173,7 +173,7 @@
             <key>/schemas/apps/gnome_settings_daemon/keybindings/pause</key>
             <applyto>/apps/gnome_settings_daemon/keybindings/pause</applyto>
             <type>string</type>
-            <default></default>
+            <default>XF86AudioPause</default>
             <locale name="C">
                 <short>Pause</short>
                 <long>Pause key's shortcut.</long>
@@ -185,7 +185,7 @@
             <key>/schemas/apps/gnome_settings_daemon/keybindings/stop</key>
             <applyto>/apps/gnome_settings_daemon/keybindings/stop</applyto>
             <type>string</type>
-            <default></default>
+            <default>XF86AudioStop</default>
             <locale name="C">
                 <short>Stop playback key</short>
                 <long>Stop playback key's shortcut.</long>
@@ -197,7 +197,7 @@
             <key>/schemas/apps/gnome_settings_daemon/keybindings/previous</key>
             <applyto>/apps/gnome_settings_daemon/keybindings/previous</applyto>
             <type>string</type>
-            <default></default>
+            <default>XF86AudioPrev</default>
             <locale name="C">
                 <short>Skip to previous track</short>
                 <long>Previous track key's shortcut.</long>
@@ -209,7 +209,7 @@
             <key>/schemas/apps/gnome_settings_daemon/keybindings/next</key>
             <applyto>/apps/gnome_settings_daemon/keybindings/next</applyto>
             <type>string</type>
-            <default></default>
+            <default>XF86AudioNext</default>
             <locale name="C">
                 <short>Skip to next track</short>
                 <long>Next track key's shortcut.</long>
--- control-center-2.17.1/capplets/keybindings/gnome-keybinding-properties.c	27 Jul 2006 11:42:11 -0000	1.56
+++ control-center-2.17.1/capplets/keybindings/gnome-keybinding-properties.c	15 Nov 2006 16:53:29 -0000
@@ -30,6 +30,7 @@ typedef struct
   const char *name;
   KeyListEntryVisibility visibility;
   gint data;
+  guint32 should_bind_keysym;
 } KeyListEntry;
 
 static const KeyListEntry desktop_key_list[] =
@@ -55,12 +56,12 @@ static const KeyListEntry sounds_key_lis
   { "/apps/gnome_settings_daemon/keybindings/volume_down", ALWAYS_VISIBLE, 0 },
   { "/apps/gnome_settings_daemon/keybindings/volume_up", ALWAYS_VISIBLE, 0 },
   /* Other ones that need keysyms bindings */
-  { "/apps/gnome_settings_daemon/keybindings/play", ALWAYS_VISIBLE, 0 },        
-  { "/apps/gnome_settings_daemon/keybindings/pause", ALWAYS_VISIBLE, 0 },       
-  { "/apps/gnome_settings_daemon/keybindings/stop", ALWAYS_VISIBLE, 0 },        
-  { "/apps/gnome_settings_daemon/keybindings/previous", ALWAYS_VISIBLE, 0 },    
-  { "/apps/gnome_settings_daemon/keybindings/next", ALWAYS_VISIBLE, 0 },        
-  { "/apps/gnome_settings_daemon/keybindings/eject", ALWAYS_VISIBLE, 0 },
+  { "/apps/gnome_settings_daemon/keybindings/play", ALWAYS_VISIBLE, 0, TRUE },        
+  { "/apps/gnome_settings_daemon/keybindings/pause", ALWAYS_VISIBLE, 0, TRUE },       
+  { "/apps/gnome_settings_daemon/keybindings/stop", ALWAYS_VISIBLE, 0, TRUE },        
+  { "/apps/gnome_settings_daemon/keybindings/previous", ALWAYS_VISIBLE, 0, TRUE },    
+  { "/apps/gnome_settings_daemon/keybindings/next", ALWAYS_VISIBLE, 0, TRUE },        
+  { "/apps/gnome_settings_daemon/keybindings/eject", ALWAYS_VISIBLE, 0, TRUE },
   { NULL }
 };
 
@@ -136,7 +137,8 @@ typedef struct
   guint keyval;
   guint keycode;
   EggVirtualModifierType mask;
-  gboolean editable;
+  guint32 editable : 1;
+  guint32 should_bind_keysym : 1;
   GtkTreeModel *model;
   guint gconf_cnxn;
   char *description;
@@ -502,6 +504,7 @@ append_keys_to_tree (GladeXML           
       key_entry = g_new0 (KeyEntry, 1);
       key_entry->gconf_key = g_strdup (key_string);
       key_entry->editable = gconf_entry_get_is_writable (entry);
+      key_entry->should_bind_keysym = keys_list[j].should_bind_keysym;
       key_entry->model = model;
       gconf_client_add_dir (client, key_string, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
       key_entry->gconf_cnxn = gconf_client_notify_add (client,
@@ -627,6 +630,13 @@ accel_edited_callback (GtkCellRendererTe
   if (key_entry == NULL)
     return;
 
+  /* These keys are special, in that we'll remap the keysym
+   * to whatever keycode the user picks.  This means we should
+   * always store the keycode instead of the keysym in gconf.
+   */
+  if (key_entry->should_bind_keysym)
+    keyval = 0;
+
   model = get_real_model (view);
   tmp_key.model  = model;
   tmp_key.keyval = keyval;
@@ -641,8 +651,10 @@ accel_edited_callback (GtkCellRendererTe
       (GtkTreeModelForeachFunc) cb_check_for_uniqueness,
       &tmp_key);
 
-  /* Check for unmodified keys */
-  if (tmp_key.mask == 0 && tmp_key.keycode != 0)
+  /* Check for unmodified keys or non-multimedia key for multimedia action
+   */ 
+  if ((tmp_key.mask == 0 && tmp_key.keycode != 0) || 
+      key_entry->should_bind_keysym)
     {
       if ((tmp_key.keyval >= GDK_a && tmp_key.keyval <= GDK_z)
 	   || (tmp_key.keyval >= GDK_A && tmp_key.keyval <= GDK_Z)
@@ -654,9 +666,12 @@ accel_edited_callback (GtkCellRendererTe
 	   || (tmp_key.keyval >= GDK_Thai_kokai && tmp_key.keyval <= GDK_Thai_lekkao)
 	   || (tmp_key.keyval >= GDK_Hangul && tmp_key.keyval <= GDK_Hangul_Special)
 	   || (tmp_key.keyval >= GDK_Hangul_Kiyeog && tmp_key.keyval <= GDK_Hangul_J_YeorinHieuh)
-	   || tmp_key.keyval == GDK_Mode_switch) {
+	   || (tmp_key.keyval == GDK_Mode_switch)
+	   || (key_entry->should_bind_keysym && tmp_key.mask != 0)) {
         GtkWidget *dialog;
 	char *name;
+	static const char unmodified_key_message[] = "The shortcut \"%s\" cannot be used because it will become unusable to type using this key.\nPlease try with a key such as Control, Alt or Shift at the same time.\n";
+	static const char non_multimedia_key_message[] = "The shortcut \"%s\" cannot be used because it is not a multimedia key.\n";
 
 	name = egg_virtual_accelerator_name (keyval, keycode, mask);
 
@@ -665,8 +680,9 @@ accel_edited_callback (GtkCellRendererTe
 			  	  GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
 				  GTK_MESSAGE_WARNING,
 				  GTK_BUTTONS_CANCEL,
-				  _("The shortcut \"%s\" cannot be used because it will become unusable to type using this key.\n"
-				  "Please try with a key such as Control, Alt or Shift at the same time.\n"),
+				  !key_entry->should_bind_keysym? 
+				  _(unmodified_key_message):
+				  _(non_multimedia_key_message),
 				  name);
 
 	g_free (name);
diff -u -p -r1.21 gnome-settings-multimedia-keys.c
--- control-center-2.17.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c	24 Aug 2006 14:44:43 -0000	1.21
+++ control-center-2.17.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c	15 Nov 2006 16:53:30 -0000
@@ -346,7 +346,8 @@ update_kbd_cb (GConfClient *client, guin
 
 			key = g_new0 (Key, 1);
 			if (egg_accelerator_parse_virtual (tmp, &key->keysym, &key->keycode, &key->state) == FALSE
-			    || key->keycode == 0)
+			    || key->keycode == 0
+			    || (key->state & USED_MODS) != 0)
 			{
 				g_free (tmp);
 				g_free (key);
@@ -467,7 +468,8 @@ init_kbd (Acme *acme)
 
 		key = g_new0 (Key, 1);
 		if (egg_accelerator_parse_virtual (tmp, &key->keysym, &key->keycode, &key->state) == FALSE
-		    || key->keycode == 0)
+		    || key->keycode == 0
+		    || (key->state & USED_MODS) != 0)
 		{                                       
 			g_free (tmp);
 			g_free (key);

control-center-2.15.91-fix-thumbnailing.patch:
 gnome-wp-info.c |   26 --------------------------
 gnome-wp-item.c |    4 ++++
 2 files changed, 4 insertions(+), 26 deletions(-)

Index: control-center-2.15.91-fix-thumbnailing.patch
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center-2.15.91-fix-thumbnailing.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- control-center-2.15.91-fix-thumbnailing.patch	21 Aug 2006 16:36:12 -0000	1.1
+++ control-center-2.15.91-fix-thumbnailing.patch	17 Nov 2006 15:24:04 -0000	1.2
@@ -50,11 +50,11 @@
 @@ -258,6 +258,10 @@
  					    escaped_path,
  					    item->fileinfo->mtime);
-     g_free (escaped_path);
 +    g_free (item->fileinfo->thumburi);
 +    item->fileinfo->thumburi = gnome_thumbnail_factory_lookup (thumbs,
 +							       escaped_path,
 +							       item->fileinfo->mtime);
+     g_free (escaped_path);
    }
  
    if (pixbuf != NULL) {


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- control-center.spec	8 Nov 2006 20:03:25 -0000	1.199
+++ control-center.spec	17 Nov 2006 15:24:04 -0000	1.200
@@ -21,41 +21,64 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.17.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/control-center/2.16/control-center-%{version}.tar.bz2
 
-Patch1: control-center-2.16.0-fedora-apps.patch
-Patch2: control-center-2.9.4-filesel.patch
-Patch3: control-center-2.10.1-mark-tool-buttons-important.patch
-Patch4: control-center-2.13.90-about-me-faces.patch
-Patch5: control-center-2.12.0-run-power-manager.patch
-Patch6: control-center-2.12.1-passwd.patch
-Patch7: control-center-2.15.4-gecos.patch
-Patch9: control-center-2.15.4-add-dbus-flags.patch
-# Dobey being unreasonable again
-Patch10: control-center-2.15.4-finish.patch
-Patch11: control-center-2.15.91-search.patch
-Patch12: control-center-2.15.91-fix-thumbnailing.patch
-Patch13: control-center-2.15.91-compiz-support.patch
-Patch14: control-center-2.15.92-fix-media-keys.patch
-
+# Remove "Apply" button and just have "Close" instead
+# FIXME: We should figure out what to do about this...either get
+# it upstreamed or drop it I guess.
+Patch1: control-center-2.15.4-finish.patch
+
+# Optionally bring up beagle if available
+# FIXME: need to get this filed upstream
+Patch2: control-center-2.15.91-search.patch
+
+# drop help button from a dialog that doesn't have
+# help
+# FIXME: need to get this filed upstream
+Patch3: control-center-2.16.0-about-me-help.patch
+
+# http://bugzilla.gnome.org/show_bug.cgi?id=351991
+Patch4: control-center-2.15.91-fix-thumbnailing.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=376045
+Patch5: control-center-2.15.91-compiz-support.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=133815
+Patch6: control-center-2.17.1-fix-media-keys.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=352777
-Patch16: keyboard-drawing-rotated-text.patch
+Patch7: keyboard-drawing-rotated-text.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=352778
-Patch17: keyboard-drawing-label-color.patch
+Patch8: keyboard-drawing-label-color.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=352779
-Patch18: keyboard-drawing-primary.patch
+Patch9: keyboard-drawing-primary.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=352781
-Patch19: keyboard-drawing-corner.patch
+Patch10: keyboard-drawing-corner.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=353163
-Patch20: keyboard-drawing-redraw.patch
+Patch11: keyboard-drawing-redraw.patch
+
+# ubuntu has a better patch for this in the works
+# apparently http://blog.omma.net/?p=16
+# We should either wait for it to get upstream, or
+# hunt through the 6.1MB (!!) patch file against
+# control-center
+Patch12: control-center-2.16.0-start-at-helper.patch
+
+# call the Fedora/RHEL graphical passwd changing apps
+Patch95: control-center-2.12.1-passwd.patch
+Patch96: control-center-2.15.4-gecos.patch
+
+# change default faces directory to where we ship faces
+# (should probably be filed upstream)
+Patch97: control-center-2.13.90-about-me-faces.patch
+
+# change default wallpaper directory to where we ship our
+# backgrounds
+Patch98: control-center-2.9.4-filesel.patch
 
-Patch21: control-center-2.16.0-start-at-helper.patch
-Patch22: control-center-2.16.0-default-applications-browser-fixes.patch
-Patch23: control-center-2.16.0-about-me-help.patch
+# change default preferred apps to programs we ship
+Patch99: control-center-2.17.1-default-apps.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
@@ -88,8 +111,6 @@
 BuildRequires: bonobo-activation-devel
 BuildRequires: fontconfig-devel >= %{fontconfig_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
-BuildRequires: /usr/bin/automake-1.4
-BuildRequires: /usr/bin/autoconf
 BuildRequires: metacity >= %{metacity_version}
 BuildRequires: libxklavier-devel >= %{libxklavier_version}
 BuildRequires: libXcursor-devel
@@ -142,30 +163,27 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .fedora-apps
-%patch2 -p1 -b .filesel
-%patch3 -p1 -b .mark-tool-buttons-important
-%patch4 -p1 -b .about-me-faces
-%patch5 -p1 -b .run-power-manager
-%patch6 -p1 -b .passwd
-%patch7 -p1 -b .gecos
-%patch9 -p1 -b .add-dbus-flags
-%patch10 -p1 -b .finish
-%patch11 -p1 -b .search
-%patch12 -p1 -b .fix-thumbnailing
-%patch13 -p1 -b .compiz-support
-%patch14 -p1 -b .fix-media-keys
-
-%patch16 -p1 -b .rotated-text
-%patch17 -p1 -b .label-color
-%patch18 -p1 -b .primary
-%patch19 -p1 -b .corner
-%patch20 -p1 -b .redraw
-
-%patch21 -p1 -b .start-at-helper
-%patch22 -p1 -b .default-applications-browser-fixes
-%patch23 -p1 -b .about-me-help
-
+%patch1 -p1 -b .finish
+%patch2 -p1 -b .search
+%patch3 -p1 -b .about-me-help
+%patch4 -p1 -b .fix-thumbnailing
+%patch5 -p1 -b .compiz-support
+%patch6 -p1 -b .fix-media-keys
+
+%patch7 -p1 -b .rotated-text
+%patch8 -p1 -b .label-color
+%patch9 -p1 -b .primary
+%patch10 -p1 -b .corner
+%patch11 -p1 -b .redraw
+
+%patch12 -p1 -b .start-at-helper
+
+# vendor configuration patches
+%patch95 -p1 -b .passwd
+%patch96 -p1 -b .gecos
+%patch97 -p1 -b .about-me-faces
+%patch98 -p1 -b .filesel
+%patch99 -p1 -b .default-apps
 %build
 
 autoreconf
@@ -318,6 +336,11 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Nov 17 2006 Ray Strode <rstrode at redhat.com> - 2.17.1-4
+- Drop unused/bogus patches
+- Try to fix up background capplet thumbnail code again (better this time)
+- rearrange patches so that vendor patches end up at the end
+
 * Wed Nov  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.17.1-3
 - Work around a file conflict with libgnomekbd (#214608)
 


--- control-center-2.10.1-mark-tool-buttons-important.patch DELETED ---


--- control-center-2.12.0-run-power-manager.patch DELETED ---


--- control-center-2.13.90-fedora-apps.patch DELETED ---


--- control-center-2.15.4-add-dbus-flags.patch DELETED ---


--- control-center-2.15.92-fix-media-keys.patch DELETED ---


--- control-center-2.16.0-default-applications-browser-fixes.patch DELETED ---


--- control-center-2.16.0-fedora-apps.patch DELETED ---


--- keyboard-drawing-focus.patch DELETED ---


