rpms/xscreensaver/devel xscreensaver-5.00-pam-popup-passwindow.patch, 1.1, 1.2 xscreensaver.spec, 1.29, 1.30

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9461

Modified Files:
	xscreensaver-5.00-pam-popup-passwindow.patch xscreensaver.spec 
Log Message:
* Sun Sep 10 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-22
- Fix Patch114.


xscreensaver-5.00-pam-popup-passwindow.patch:

Index: xscreensaver-5.00-pam-popup-passwindow.patch
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver-5.00-pam-popup-passwindow.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xscreensaver-5.00-pam-popup-passwindow.patch	10 Sep 2006 13:51:47 -0000	1.1
+++ xscreensaver-5.00-pam-popup-passwindow.patch	10 Sep 2006 14:24:05 -0000	1.2
@@ -1,5 +1,5 @@
---- xscreensaver-5.00/driver/XScreenSaver.ad.in.poppasswin	2006-09-10 21:19:27.000000000 +0900
-+++ xscreensaver-5.00/driver/XScreenSaver.ad.in	2006-09-10 21:20:21.000000000 +0900
+--- xscreensaver-5.00/driver/XScreenSaver.ad.in.popup_passwin	2006-09-10 23:14:37.000000000 +0900
++++ xscreensaver-5.00/driver/XScreenSaver.ad.in	2006-09-10 23:14:37.000000000 +0900
 @@ -33,6 +33,8 @@
  *cycle:			0:10:00
  *lockTimeout:		0:00:00
@@ -9,8 +9,8 @@
  *dpmsEnabled:		False
  *dpmsStandby:		2:00:00
  *dpmsSuspend:		2:00:00
---- xscreensaver-5.00/driver/lock.c.poppasswin	2006-05-18 08:35:54.000000000 +0900
-+++ xscreensaver-5.00/driver/lock.c	2006-09-10 16:15:18.000000000 +0900
+--- xscreensaver-5.00/driver/lock.c.popup_passwin	2006-05-18 08:35:54.000000000 +0900
++++ xscreensaver-5.00/driver/lock.c	2006-09-10 23:14:37.000000000 +0900
 @@ -1613,6 +1613,9 @@
    si->unlock_typeahead = 0;
  }
@@ -41,8 +41,8 @@
    raise_window (si, True, True, True);
  
    if (p->verbose_p)
---- xscreensaver-5.00/driver/prefs.c.poppasswin	2006-05-24 07:03:47.000000000 +0900
-+++ xscreensaver-5.00/driver/prefs.c	2006-09-10 21:00:40.000000000 +0900
+--- xscreensaver-5.00/driver/prefs.c.popup_passwin	2006-05-24 07:03:47.000000000 +0900
++++ xscreensaver-5.00/driver/prefs.c	2006-09-10 23:17:56.000000000 +0900
 @@ -251,6 +251,8 @@
    "lockVTs",			/* not saved */
    "lockTimeout",
@@ -62,8 +62,18 @@
        CHECK("visualID")		type = pref_str,  s =    visual_name;
        CHECK("installColormap")	type = pref_bool, b = p->install_cmap_p;
        CHECK("verbose")		type = pref_bool, b = p->verbose_p;
---- xscreensaver-5.00/driver/prefs.h.poppasswin	2006-05-18 08:35:54.000000000 +0900
-+++ xscreensaver-5.00/driver/prefs.h	2006-09-10 16:06:18.000000000 +0900
+@@ -1039,6 +1044,9 @@
+   p->verbose_p	    = get_boolean_resource (dpy, "verbose", "Boolean");
+   p->timestamp_p    = get_boolean_resource (dpy, "timestamp", "Boolean");
+   p->lock_p	    = get_boolean_resource (dpy, "lock", "Boolean");
++  p->forbid_passwin_p = get_boolean_resource (dpy, "forbid_passwin", "Boolean");
++  p->pop_passwin_iffailed_p 
++                    = get_boolean_resource (dpy, "pop_passwin_iffailed", "Boolean");
+   p->fade_p	    = get_boolean_resource (dpy, "fade", "Boolean");
+   p->unfade_p	    = get_boolean_resource (dpy, "unfade", "Boolean");
+   p->fade_seconds   = 1000 * get_seconds_resource (dpy, "fadeSeconds", "Time");
+--- xscreensaver-5.00/driver/prefs.h.popup_passwin	2006-05-18 08:35:54.000000000 +0900
++++ xscreensaver-5.00/driver/prefs.h	2006-09-10 23:14:37.000000000 +0900
 @@ -87,6 +87,12 @@
    Time watchdog_timeout;	/* how often to re-raise and re-blank screen */
    int pointer_hysteresis;	/* mouse motions less than N/sec are ignored */
@@ -77,8 +87,8 @@
    Bool dpms_enabled_p;		/* Whether to power down the monitor */
    Time dpms_standby;		/* how long until monitor goes black */
    Time dpms_suspend;		/* how long until monitor power-saves */
---- xscreensaver-5.00/driver/xscreensaver.man.poppasswin	2005-07-24 03:21:24.000000000 +0900
-+++ xscreensaver-5.00/driver/xscreensaver.man	2006-09-10 22:01:43.000000000 +0900
+--- xscreensaver-5.00/driver/xscreensaver.man.popup_passwin	2005-07-24 03:21:24.000000000 +0900
++++ xscreensaver-5.00/driver/xscreensaver.man	2006-09-10 23:14:37.000000000 +0900
 @@ -146,6 +146,14 @@
  password dialog box is up (for security purposes) and leaving the server 
  grabbed for too long can cause problems.


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xscreensaver.spec	10 Sep 2006 13:51:48 -0000	1.29
+++ xscreensaver.spec	10 Sep 2006 14:24:05 -0000	1.30
@@ -1,7 +1,7 @@
 %define name          xscreensaver
 
 %define version       5.00
-%define fedora_rel    21
+%define fedora_rel    22
 
 %define default_text  %{_datadir}/eula/eula.en_US
 
@@ -389,6 +389,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Sun Sep 10 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-22
+- Fix Patch114.
+
 * Sun Sep 10 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-21
 - Try to support non-password PAM authentication (bug #205669)