rpms/control-center/F-8 control-center.spec, 1.312, 1.313 control-center-2.20.1-more-key-defaults.patch, 1.1, NONE

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/control-center/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11970

Modified Files:
	control-center.spec 
Removed Files:
	control-center-2.20.1-more-key-defaults.patch 
Log Message:
Remove upstreamed patch



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-8/control-center.spec,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -r1.312 -r1.313
--- control-center.spec	8 Jan 2008 16:42:45 -0000	1.312
+++ control-center.spec	8 Jan 2008 17:06:26 -0000	1.313
@@ -41,9 +41,6 @@
 # FIXME: need to get this filed upstream
 Patch4: control-center-2.16.0-about-me-help.patch
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=330501
-Patch5: control-center-2.20.1-more-key-defaults.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
@@ -195,9 +192,6 @@
 #%patch1 -p1 -b .finish
 %patch3 -p1 -b .search
 %patch4 -p1 -b .about-me-help
-pushd schemas/
-%patch5 -p0 -b .more-default-keys
-popd
 #%patch12 -p1 -b .start-at-helper
 %patch13 -p1 -b .no-gnome-common
 %patch14 -p1 -b .gnome-bg
@@ -403,6 +397,7 @@
 %changelog
 * Tue Jan 08 2008 - Bastien Nocera <bnocera at redhat.com> - 2.20.3-1
 - Update to 2.20.3
+- Remove upstreamed patch
 
 * Mon Nov 12 2007 Thomas Woerner <twoerner at redhat.com> - 2.20.1-5.1
 - Honour /desktop/gnome/background/draw_background in 


--- control-center-2.20.1-more-key-defaults.patch DELETED ---