rpms/xscreensaver/devel xscreensaver-5.00-browser-setting.patch, 1.1, 1.2 xscreensaver.spec, 1.2, 1.3

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	xscreensaver-5.00-browser-setting.patch xscreensaver.spec 
Log Message:
* Wed May 31 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-3
- Fix browser option patch.


xscreensaver-5.00-browser-setting.patch:

Index: xscreensaver-5.00-browser-setting.patch
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver-5.00-browser-setting.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xscreensaver-5.00-browser-setting.patch	31 May 2006 14:13:44 -0000	1.1
+++ xscreensaver-5.00-browser-setting.patch	31 May 2006 15:41:54 -0000	1.2
@@ -1,47 +1,6 @@
 --- xscreensaver-5.00/configure.in.browser-setting	2006-05-24 07:07:00.000000000 +0900
-+++ xscreensaver-5.00/configure.in	2006-05-31 03:42:39.000000000 +0900
-@@ -1793,6 +1793,40 @@
- 
- ###############################################################################
- #
-+#       Whether to allow root password to unblank.
-+#
-+###############################################################################
-+AC_ARG_ENABLE(root-passwd, [
-+  --enable-root-passwd	      Allow root passwd to unlock screen.
-+  --disable-root-passwd       Do not allow that.],
-+  [enable_root_passwd="$enableval"],[enable_root_passwd=yes])
-+if test "$enable_root_passwd" = yes; then
-+  AC_DEFINE(ALLOW_ROOT_PASSWD)
-+  true
-+elif test "$enable_root_passwd" != no; then
-+  echo "error: something wrong with root-passwd option. Check configure.in ."
-+  exit 1
-+fi
-+
-+###############################################################################
-+#
-+#       Whether to allow root password to unblank.
-+#
-+###############################################################################
-+AC_ARG_ENABLE(root-passwd, [
-+  --enable-root-passwd	      Allow root passwd to unlock screen.
-+  --disable-root-passwd       Do not allow that.],
-+  [enable_root_passwd="$enableval"],[enable_root_passwd=yes])
-+if test "$enable_root_passwd" = yes; then
-+  AC_DEFINE(ALLOW_ROOT_PASSWD)
-+  true
-+elif test "$enable_root_passwd" != no; then
-+  echo "error: something wrong with root-passwd option. Check configure.in ."
-+  exit 1
-+fi
-+
-+###############################################################################
-+#
- #       Check for PAM.
- #
- ###############################################################################
-@@ -2430,6 +2464,7 @@
++++ xscreensaver-5.00/configure.in	2006-06-01 00:25:45.000000000 +0900
+@@ -2430,6 +2430,7 @@
  
  # Check for the various Gnome help and URL loading programs.
  #
@@ -49,7 +8,7 @@
  if test "$have_gtk" = yes; then
    AC_CHECK_PROGS(gnome_open_program,     gnome-open)
    AC_CHECK_PROGS(gnome_url_show_program, gnome-url-show)
-@@ -3359,6 +3394,45 @@
+@@ -3359,6 +3360,45 @@
  
  ###############################################################################
  #
@@ -95,7 +54,7 @@
  #       Check whether it's ok to install some hacks as setuid (e.g., "sonar")
  #       This should be safe, but let's give people the option.
  #
-@@ -3579,6 +3653,7 @@
+@@ -3579,6 +3619,7 @@
  AC_SUBST(DEFAULT_IMAGES_P)
  AC_SUBST(DEFAULT_IMAGE_DIRECTORY)
  AC_SUBST(DEFAULT_TEXT_FILE)
@@ -104,7 +63,7 @@
  AC_SUBST(OBJCC)
  AC_SUBST(EXES_OSX)
 --- xscreensaver-5.00/driver/XScreenSaver.ad.in.browser-setting	2006-05-24 08:01:34.000000000 +0900
-+++ xscreensaver-5.00/driver/XScreenSaver.ad.in	2006-05-31 03:44:31.000000000 +0900
++++ xscreensaver-5.00/driver/XScreenSaver.ad.in	2006-06-01 00:24:49.000000000 +0900
 @@ -93,7 +93,7 @@
  !
  !   Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3)


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xscreensaver.spec	31 May 2006 14:13:44 -0000	1.2
+++ xscreensaver.spec	31 May 2006 15:41:54 -0000	1.3
@@ -1,7 +1,7 @@
 %define	name 		xscreensaver
 
 %define version		5.00
-%define fedora_rel	2
+%define fedora_rel	3
 
 %define fedora_ver	5.89
 %define default_text %{_datadir}/doc/fedora-release-%{fedora_ver}/eula.txt
@@ -237,6 +237,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Wed May 31 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-3
+- Fix browser option patch.
+
 * Wed May 31 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-2
 - Change the default text.
 - Rewrite root passwd patch.