rpms/gnome-screensaver/devel gnome-screensaver.spec,1.66,1.67

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11583

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



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gnome-screensaver.spec	10 Apr 2006 22:25:37 -0000	1.66
+++ gnome-screensaver.spec	10 Apr 2006 22:28:47 -0000	1.67
@@ -28,7 +28,6 @@
 Patch1: gnome-screensaver-0.0.23-use-floaters-by-default.patch
 Patch2: gnome-screensaver-2.13.91-shrink-em.patch
 Patch3: gnome-screensaver-2.14.0-pass-krb-environment.patch
-Patch4: gnome-screensaver-2.14.0-fix-timeout.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gnome.org
@@ -66,7 +65,6 @@
 %patch1 -p1 -b .use-floaters-by-default
 %patch2 -p1 -b .shrink-em
 %patch3 -p1 -b .pass-krb-environment
-%patch4 -p1 -b .fix-timeout
 
 %build
 intltoolize --force
@@ -168,6 +166,7 @@
 %changelog
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> 2.14.1-2
 - Update to 2.14.1
+- Drop upstreamed patch
 
 * Tue Apr  4 2006 Ray Strode <rstrode at redhat.com> 2.14.0-4
 - don't ignore idle timers after long suspend