rpms/xscreensaver/F-8 xscreensaver-5.03-screen-depth.patch, 1.1, 1.2 xscreensaver.spec, 1.58, 1.59

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2578/F-8

Modified Files:
	xscreensaver-5.03-screen-depth.patch xscreensaver.spec 
Log Message:
Reupload the correct patch and apply patches also for FC-6

xscreensaver-5.03-screen-depth.patch:

Index: xscreensaver-5.03-screen-depth.patch
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-8/xscreensaver-5.03-screen-depth.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xscreensaver-5.03-screen-depth.patch	1 Nov 2007 13:50:23 -0000	1.1
+++ xscreensaver-5.03-screen-depth.patch	1 Nov 2007 14:16:27 -0000	1.2
@@ -1,6 +1,5 @@
-diff -u -r1.85 lock.c
---- lock.c	10 Jul 2007 20:27:24 -0000	1.85
-+++ lock.c	1 Nov 2007 09:34:59 -0000
+--- xscreensaver-5.03/driver/lock.c.orig	2007-07-11 05:19:00.000000000 +0900
++++ xscreensaver-5.03/driver/lock.c	2007-11-01 19:03:18.000000000 +0900
 @@ -1076,9 +1076,10 @@
  	      pw->user_entry_pixmap = 0;
  	    }
@@ -11,7 +10,8 @@
 +	  pw->user_entry_pixmap = 
 +            XCreatePixmap (si->dpy, si->passwd_dialog,
 +                           rects[0].width, rects[0].height, 
-+                           DefaultDepthOfScreen (pw->prompt_screen));
++                           DefaultDepthOfScreen (pw->prompt_screen->screen));
  
  	  XFillRectangle (si->dpy, pw->user_entry_pixmap, gc2,
  			  0, 0, rects[0].width, rects[0].height);
+


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-8/xscreensaver.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- xscreensaver.spec	1 Nov 2007 13:50:23 -0000	1.58
+++ xscreensaver.spec	1 Nov 2007 14:16:27 -0000	1.59
@@ -7,7 +7,7 @@
 %define fedora_rel    1.12
 %else
 %define modular_conf  1
-%define fedora_rel    13
+%define fedora_rel    14
 %endif
 
 %define extrarel      %{nil}
@@ -76,7 +76,9 @@
 %endif
 Requires:        %{_sysconfdir}/pam.d/system-auth
 Requires:        pam > %{pam_ver}
+%if 0%{?fedora} >= 7
 Requires:        xdg-utils
+%endif
 Requires:        xorg-x11-resutils
 Requires:        xorg-x11-fonts-ISO8859-1-100dpi
 
@@ -98,7 +100,11 @@
 Obsoletes:       xscreensaver-gl <= 1:5.00
 BuildRequires:   libGL-devel
 BuildRequires:   libGLU-devel
+%if %{modular_conf}
 Requires:        %{name}-gl-base = %{epoch}:%{version}-%{release}
+%else
+Requires:        %{name}-base = %{epoch}:%{version}-%{release}
+%endif
 
 %package extras-gss
 Summary:         Desktop files of extras for gnome-screensaver
@@ -297,7 +303,11 @@
 CONFIG_OPTS="$CONFIG_OPTS --with-text-file=%{default_text}"
 CONFIG_OPTS="$CONFIG_OPTS --with-x-app-defaults=%{_datadir}/X11/app-defaults"
 CONFIG_OPTS="$CONFIG_OPTS --disable-root-passwd"
+%if 0%{?fedora} >= 7
 CONFIG_OPTS="$CONFIG_OPTS --with-browser=xdg-open"
+%else
+CONFIG_OPTS="$CONFIG_OPTS --with-browser=htmlview"
+%endif
 
 # This is flaky:
 # CONFIG_OPTS="$CONFIG_OPTS --with-login-manager"
@@ -562,7 +572,7 @@
 %defattr(-,root,root,-)
 
 %changelog
-* Thu Nov  1 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-13
+* Thu Nov  1 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-14
 - Patch from upstream to fix screen depth problem (also "really"
   fix bug 336331).