rpms/xscreensaver/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xscreensaver.spec, 1.35, 1.36

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18693

Modified Files:
	.cvsignore sources xscreensaver.spec 
Log Message:
* Sat Apr 21 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.02-1
- Update to 5.02



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Sep 2006 06:22:17 -0000	1.3
+++ .cvsignore	21 Apr 2007 13:10:52 -0000	1.4
@@ -1 +1 @@
-xscreensaver-5.01.tar.gz
+xscreensaver-5.02.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Sep 2006 06:22:17 -0000	1.3
+++ sources	21 Apr 2007 13:10:52 -0000	1.4
@@ -1 +1 @@
-b60abc52b39591750f48f9c9f20c4167  xscreensaver-5.01.tar.gz
+83937791b30f55f52011d4fee0f5dff3  xscreensaver-5.02.tar.gz


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/FC-6/xscreensaver.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xscreensaver.spec	3 Feb 2007 04:39:03 -0000	1.35
+++ xscreensaver.spec	21 Apr 2007 13:10:52 -0000	1.36
@@ -1,16 +1,19 @@
 %define name          xscreensaver
 
-%define version       5.01
+%define version       5.02
 %define beta_ver      %{nil}
-%define fedora_rel    6
+%define fedora_rel    1
 
-%define default_text  %{_datadir}/eula/eula.en_US
+%if 0%{?fedora} >= 7
+%define default_text  %{_datadir}/doc/HTML/README-Accessibility
+%else
+%define default_text  %{_datadir}/doc/eula.en_US
+%endif
 
 %define pam_ver       0.80-7
 %define autoconf_ver  2.53
 
 %define update_po     1
-%define allow_non_passwd    0
 
 Buildroot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,7 +29,6 @@
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch8:          xscreensaver-5.00b5-include-directory.patch
 Patch21:         xscreensaver-5.01-webcollage-default-nonet.patch
-Patch114:        xscreensaver-5.01a1-pam-popup-passwindow.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -36,9 +38,6 @@
 Group:           Amusements/Graphics
 BuildRequires:   gettext
 BuildRequires:   desktop-file-utils
-%if %{allow_non_passwd}
-BuildRequires:   autoconf >= %{autoconf_ver}
-%endif
 BuildRequires:   sed
 BuildRequires:   libtool
 BuildRequires:   bc
@@ -53,7 +52,11 @@
 BuildRequires:   libXxf86vm-devel
 BuildRequires:   libjpeg-devel
 BuildRequires:   gtk2-devel libglade2-devel
+%if 0%{?fedora} >= 7
+BuildRequires:   fedora-release-notes
+%else
 BuildRequires:   fedora-release
+%endif
 Requires:        /etc/pam.d/system-auth
 Requires:        pam > %{pam_ver}
 Requires:        xorg-x11-resutils
@@ -149,10 +152,6 @@
 %patch1 -p1 -b .sanitize-hacks
 %patch8 -p1 -b .include-dir
 %patch21 -p1 -b .nonet
-# don't apply for now
-%if %{allow_non_passwd}
-%patch114 -p1 -b .non-passwd
-%endif
 
 change_option(){
    set +x
@@ -197,8 +196,7 @@
    lock=True \
    splash=False \
    ignoreUninstalledPrograms=True \
-   textProgram=fortune\ -s \
-   passwd.heading.label=Screen\ Locked
+   textProgram=fortune\ -s
 
 # silence the following hacks by default
 silence_hack driver/XScreenSaver.ad.in \
@@ -244,9 +242,6 @@
 fi
 
 %build
-%if %{allow_non_passwd}
-autoconf
-%endif
 archdir=`./config.guess`
 mkdir $archdir
 cd $archdir
@@ -259,9 +254,6 @@
 CONFIG_OPTS="$CONFIG_OPTS --with-x-app-defaults=%{_datadir}/X11/app-defaults"
 CONFIG_OPTS="$CONFIG_OPTS --disable-root-passwd"
 CONFIG_OPTS="$CONFIG_OPTS --with-browser=htmlview"
-%if %{allow_non_passwd}
-CONFIG_OPTS="$CONFIG_OPTS --disable-non-passwd"
-%endif
 
 # This is flaky:
 # CONFIG_OPTS="$CONFIG_OPTS --with-login-manager"
@@ -430,6 +422,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Sat Apr 21 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.02-1
+- Update to 5.02
+
 * Sat Feb  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.01-6
 - Make hack packages require base package (#227017)
 - Create xscreensaver metapackage