rpms/gnome-screensaver/F-7 .cvsignore, 1.39, 1.40 gnome-screensaver.spec, 1.152, 1.153 sources, 1.42, 1.43

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-screensaver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26799

Modified Files:
	.cvsignore gnome-screensaver.spec sources 
Log Message:
2.18.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/F-7/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	13 Mar 2007 18:29:18 -0000	1.39
+++ .cvsignore	30 May 2007 03:07:00 -0000	1.40
@@ -1 +1 @@
-gnome-screensaver-2.18.0.tar.bz2
+gnome-screensaver-2.18.2.tar.bz2


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/F-7/gnome-screensaver.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- gnome-screensaver.spec	21 May 2007 20:37:40 -0000	1.152
+++ gnome-screensaver.spec	30 May 2007 03:07:00 -0000	1.153
@@ -12,22 +12,17 @@
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
-Version: 2.18.0
-Release: 13%{?dist} 
+Version: 2.18.2
+Release: 1%{?dist} 
 License: GPL
 Group: Amusements/Graphics
-Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/2.18/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-screensaver/2.18/%{name}-%{version}.tar.bz2
 Source1: gnome-screensaver-hide-xscreensaver.menu
 
 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
 
 Patch7: gnome-screensaver-2.18.0-handle-overlapping-heads.patch
 
@@ -73,9 +68,6 @@
 %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
 
 %build
@@ -133,6 +125,10 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Tue May 29 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.2-1
+- Update to 2.18.2
+- Drop upstreamed patches
+
 * Mon May 21 2007 Ray Strode <rstrode at redhat.com> - 2.18.0-13
 - Yet another crack at bug 238961.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/F-7/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	13 Mar 2007 18:29:18 -0000	1.42
+++ sources	30 May 2007 03:07:00 -0000	1.43
@@ -1 +1 @@
-c123d954b215d970dad117b15ca46cd7  gnome-screensaver-2.18.0.tar.bz2
+b5931e1f39c62acee0df1fcf016ddc39  gnome-screensaver-2.18.2.tar.bz2