rpms/gnome-screensaver/devel gnome-screensaver-2.26.0-securitytoken.patch, 1.2, 1.3 gnome-screensaver.spec, 1.211, 1.212
Bastien Nocera
hadess at fedoraproject.org
Fri Jun 26 15:28:47 UTC 2009
- Previous message: rpms/bzr/devel .cvsignore, 1.46, 1.47 bzr.spec, 1.65, 1.66 sources, 1.46, 1.47
- Next message: rpms/flickrnet/F-11 flickrnet.pc,1.1,1.2 flickrnet.spec,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: hadess
Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31642
Modified Files:
gnome-screensaver-2.26.0-securitytoken.patch
gnome-screensaver.spec
Log Message:
Update security token patch
gnome-screensaver-2.26.0-securitytoken.patch:
Index: gnome-screensaver-2.26.0-securitytoken.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver-2.26.0-securitytoken.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnome-screensaver-2.26.0-securitytoken.patch 19 Mar 2009 04:47:07 -0000 1.2
+++ gnome-screensaver-2.26.0-securitytoken.patch 26 Jun 2009 15:28:46 -0000 1.3
@@ -258,12 +258,12 @@ diff -up gnome-screensaver-2.26.0/src/gs
+ gs_debug ("Unable to lock the screen");
+ }
+}
-diff -up gnome-screensaver-2.26.0/src/Makefile.am.securitytoken gnome-screensaver-2.26.0/src/Makefile.am
---- gnome-screensaver-2.26.0/src/Makefile.am.securitytoken 2009-03-18 11:39:58.000000000 -0400
-+++ gnome-screensaver-2.26.0/src/Makefile.am 2009-03-19 00:20:36.635194085 -0400
-@@ -51,6 +51,18 @@ noinst_PROGRAMS = \
- test-window \
- $(NULL)
+diff -upr gnome-screensaver-2.27.0.orig/src/Makefile.am gnome-screensaver-2.27.0/src/Makefile.am
+--- gnome-screensaver-2.27.0.orig/src/Makefile.am 2009-06-15 18:35:56.000000000 +0100
++++ gnome-screensaver-2.27.0/src/Makefile.am 2009-06-26 16:25:29.000000000 +0100
+@@ -56,6 +56,18 @@ desktop_in_files = gnome-screensaver.des
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ @INTLTOOL_DESKTOP_RULE@
+noinst_LIBRARIES = libsecuritytoken.a
+
@@ -280,7 +280,7 @@ diff -up gnome-screensaver-2.26.0/src/Ma
gnome_screensaver_command_SOURCES = \
gnome-screensaver-command.c \
$(NULL)
-@@ -208,6 +220,7 @@ gnome_screensaver_gl_helper_SOURCES = \
+@@ -213,6 +225,7 @@ gnome_screensaver_gl_helper_SOURCES = \
gnome_screensaver_LDADD = \
$(GNOME_SCREENSAVER_LIBS) \
$(SAVER_LIBS) \
Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -p -r1.211 -r1.212
--- gnome-screensaver.spec 26 Jun 2009 15:01:31 -0000 1.211
+++ gnome-screensaver.spec 26 Jun 2009 15:28:46 -0000 1.212
@@ -75,7 +75,7 @@ simple, sane, secure defaults and be wel
%prep
%setup -q
%patch1 -p1 -b .use-floaters-by-default
-%patch2 -p1 -b .securitytoken
+#%patch2 -p1 -b .securitytoken
%patch3 -p1 -b .disable-entry
%patch7 -p1 -b .blank-by-default
%patch8 -p1 -b .selinux-permit
- Previous message: rpms/bzr/devel .cvsignore, 1.46, 1.47 bzr.spec, 1.65, 1.66 sources, 1.46, 1.47
- Next message: rpms/flickrnet/F-11 flickrnet.pc,1.1,1.2 flickrnet.spec,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list