rpms/gnome-screensaver/devel .cvsignore, 1.40, 1.41 gnome-screensaver-2.18.0-securitytoken.patch, 1.1, 1.2 gnome-screensaver.spec, 1.156, 1.157 sources, 1.43, 1.44

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	.cvsignore gnome-screensaver-2.18.0-securitytoken.patch 
	gnome-screensaver.spec sources 
Log Message:
2.19.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	20 May 2007 15:21:45 -0000	1.40
+++ .cvsignore	31 Jul 2007 01:42:29 -0000	1.41
@@ -1 +1 @@
-gnome-screensaver-2.19.1.1.tar.bz2
+gnome-screensaver-2.19.6.tar.bz2

gnome-screensaver-2.18.0-securitytoken.patch:

Index: gnome-screensaver-2.18.0-securitytoken.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/gnome-screensaver-2.18.0-securitytoken.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-screensaver-2.18.0-securitytoken.patch	14 Mar 2007 14:58:55 -0000	1.1
+++ gnome-screensaver-2.18.0-securitytoken.patch	31 Jul 2007 01:42:29 -0000	1.2
@@ -2832,16 +2832,6 @@
 +    return 0;
 +}
 +#endif
---- gnome-screensaver-2.18.0/src/gs-window-x11.c.securitytoken	2007-02-22 23:39:09.000000000 -0500
-+++ gnome-screensaver-2.18.0/src/gs-window-x11.c	2007-03-14 10:55:13.000000000 -0400
-@@ -806,6 +806,7 @@
-                 "XAUTHLOCALHOSTNAME",
-                 "KRB5CCNAME",
-                 "KRBTKFILE",
-+                "PKCS11_LOGIN_TOKEN_NAME",
-                 "LANG",
-                 "LANGUAGE",
-                 "LC_ALL",
 --- gnome-screensaver-2.18.0/src/Makefile.am.securitytoken	2007-03-12 13:07:47.000000000 -0400
 +++ gnome-screensaver-2.18.0/src/Makefile.am	2007-03-14 10:56:44.000000000 -0400
 @@ -50,6 +50,18 @@


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- gnome-screensaver.spec	30 Jul 2007 18:04:39 -0000	1.156
+++ gnome-screensaver.spec	31 Jul 2007 01:42:29 -0000	1.157
@@ -12,8 +12,8 @@
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
-Version: 2.19.1.1
-Release: 3%{?dist} 
+Version: 2.19.6
+Release: 1%{?dist} 
 License: GPL
 Group: Amusements/Graphics
 Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/2.18/%{name}-%{version}.tar.bz2
@@ -21,8 +21,6 @@
 
 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=354663
-Patch3: gnome-screensaver-2.18.0-handle-overlapping-heads.patch
 # add support for gnome-keyring to the pam stack
 Patch4: gnome-keyring.patch
 
@@ -70,7 +68,6 @@
 %setup -q 
 %patch1 -p1 -b .use-floaters-by-default
 %patch2 -p1 -b .securitytoken
-%patch3 -p1 -b .handle-overlapping-screens
 %patch4 -p1 -b .gnome-keyring
 
 %build
@@ -128,6 +125,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Mon Jul 30 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.6-1
+- Update to 2.19.6
+
 * Mon Jul 30 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.1.1-3
 - Add optional gnome-keyring support to the gnome-screensaver pam stack
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-screensaver/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	20 May 2007 15:21:45 -0000	1.43
+++ sources	31 Jul 2007 01:42:29 -0000	1.44
@@ -1 +1 @@
-bb98c66730c3a115e69cdfc50a5b0ed8  gnome-screensaver-2.19.1.1.tar.bz2
+4fc5f15e5fb94ba7194d00d7577ca901  gnome-screensaver-2.19.6.tar.bz2