rpms/gnome-screensaver/devel gnome-screensaver.spec,1.153,1.154

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-screensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10911

Modified Files:
	gnome-screensaver.spec 
Log Message:
2.19.1.1



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- gnome-screensaver.spec	20 May 2007 15:21:45 -0000	1.153
+++ gnome-screensaver.spec	21 May 2007 02:15:37 -0000	1.154
@@ -21,15 +21,8 @@
 
 Patch1: gnome-screensaver-2.15.4-default-theme.patch
 Patch2: gnome-screensaver-2.18.0-securitytoken.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=424737
-Patch3: gnome-screensaver-2.18.0-user-dirs.patch
-Patch4: gnome-screensaver-2.18.0-require-mouse-grab.patch
-# fixed in upstream trunk
-Patch5: gnome-screensaver-2.18.0-power-preferences.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=428199
-Patch6: gnome-screensaver-2.18.0-standard-flexi-server.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=354663
-Patch7: gnome-screensaver-2.18.0-handle-overlapping-heads.patch
+Patch3: gnome-screensaver-2.18.0-handle-overlapping-heads.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 URL: http://www.gnome.org
@@ -73,11 +66,7 @@
 %setup -q 
 %patch1 -p1 -b .use-floaters-by-default
 %patch2 -p1 -b .securitytoken
-#%patch3 -p1 -b .user-dirs
-%patch4 -p1 -b .require-mouse-grab
-%patch5 -p1 -b .power-preferences
-%patch6 -p1 -b .standard-flexi-server
-%patch7 -p1 -b .handle-overlapping-screens
+%patch3 -p1 -b .handle-overlapping-screens
 
 %build
 autoreconf