diff --git a/gnome-screensaver-2.26.0-securitytoken.patch b/gnome-screensaver-2.26.0-securitytoken.patch index 31de09a..6a7c3c4 100644 --- a/gnome-screensaver-2.26.0-securitytoken.patch +++ b/gnome-screensaver-2.26.0-securitytoken.patch @@ -258,12 +258,12 @@ diff -up gnome-screensaver-2.26.0/src/gs-monitor.c.securitytoken gnome-screensav + 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/Makefile.am.securitytoken gnome-screensave 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) \ diff --git a/gnome-screensaver.spec b/gnome-screensaver.spec index 28aa36a..cbdf357 100644 --- a/gnome-screensaver.spec +++ b/gnome-screensaver.spec @@ -75,7 +75,7 @@ simple, sane, secure defaults and be well integrated with the desktop. %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