Tue Sep 19 06:22:17 UTC 2006

Author: mtasaka

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

Modified Files:
	.cvsignore sources xscreensaver.spec 
Removed Files:
	xscreensaver-5.00-browser-setting.patch 
	xscreensaver-5.00-fix-hacks.patch xscreensaver-5.00-ja.po 
	xscreensaver-5.00-kill-getimage.patch 
	xscreensaver-5.00-localefix-restrict.patch 
	xscreensaver-5.00-matherr-utils.patch 
	xscreensaver-5.00-pam-popup-passwindow.patch 
	xscreensaver-5.00-po-correctdir.patch 
	xscreensaver-5.00-rootpasswd.patch 
	xscreensaver-5.00-text-locale.patch 
	xscreensaver-5.00-xmlmanfix.patch 
Log Message:
* Tue Sep 19 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.01-1
- 5.01
- Revert non-passwd auth patch and disable it for now (see bug #205669)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	26 May 2006 18:20:03 -0000	1.2
+++ .cvsignore	19 Sep 2006 06:22:17 -0000	1.3
@@ -1 +1 @@
-xscreensaver-5.00.tar.gz
+xscreensaver-5.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 May 2006 18:20:03 -0000	1.2
+++ sources	19 Sep 2006 06:22:17 -0000	1.3
@@ -1 +1 @@
-2c26877fb0acd508b9a726dce6a77f78  xscreensaver-5.00.tar.gz
+b60abc52b39591750f48f9c9f20c4167  xscreensaver-5.01.tar.gz


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xscreensaver.spec	10 Sep 2006 14:24:05 -0000	1.30
+++ xscreensaver.spec	19 Sep 2006 06:22:17 -0000	1.31
@@ -1,7 +1,8 @@
 %define name          xscreensaver
 
-%define version       5.00
-%define fedora_rel    22
+%define version       5.01
+%define beta_ver      %{nil}
+%define fedora_rel    1
 
 %define default_text  %{_datadir}/eula/eula.en_US
 
@@ -9,6 +10,7 @@
 %define autoconf_ver  2.53
 
 %define update_po     1
+%define allow_non_passwd 0
 
 Buildroot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,20 +22,10 @@
 License:         BSD
 Group:           Amusements/Graphics
 URL:             http://www.jwz.org/xscreensaver/
-Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{version}.tar.gz
-Source10:        xscreensaver-5.00-ja.po
-Patch0:          xscreensaver-5.00-browser-setting.patch
+Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{version}%{?beta_ver}.tar.gz
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
-Patch5:          xscreensaver-5.00-rootpasswd.patch
 Patch8:          xscreensaver-5.00b5-include-directory.patch
-Patch101:        xscreensaver-5.00-localefix-restrict.patch
-Patch102:        xscreensaver-5.00-matherr-utils.patch
-Patch104:        xscreensaver-5.00-xmlmanfix.patch
-Patch105:        xscreensaver-5.00-text-locale.patch
-Patch110:        xscreensaver-5.00-fix-hacks.patch
-Patch111:        xscreensaver-5.00-kill-getimage.patch
-Patch112:        xscreensaver-5.00-po-correctdir.patch
-Patch114:        xscreensaver-5.00-pam-popup-passwindow.patch
+Patch114:        xscreensaver-5.01a1-pam-popup-passwindow.patch
 
 %package base
 Summary:         A minimal installation of xscreensaver
@@ -90,24 +82,44 @@
 A modular screen saver and locker for the X Window System.
 More than 200 display modes are included in this package.
 
+%description -l fr
+Un Ã©conomiseur d'Ã©cran modulaire pour le systÃ¨me X Window.
+Plus de 200 modes d'affichages sont inclus dans ce paquet.
+
 %description base
 A modular screen saver and locker for the X Window System.
 This package contains the bare minimum needed to blank and
 lock your screen.  The graphical display modes are the
 "xscreensaver-extras" and "xscreensaver-gl-extras" packages.
 
+%description -l fr base 
+Un Ã©conomiseur d'Ã©cran modulaire pour le systÃ¨me X Window.
+Ce paquet contient le minimum vital pour Ã©teindre et verouiller
+votre Ã©cran. Les modes d'affichages graphiques sont inclus
+dans les paquets "xscreensaver-extras" et "xscreensaver-gl-extras".
+
 %description extras
 A modular screen saver and locker for the X Window System.
 This package contains a variety of graphical screen savers for
 your mind-numbing, ambition-eroding, time-wasting, hypnotized
 viewing pleasure.
 
+%description -l fr extras
+Un Ã©conomiseur d'Ã©cran modulaire pour le systÃ¨me X Window.
+Ce paquet contient une plÃ©thore d'Ã©conomiseurs d'Ã©cran graphiques
+pour votre plaisir des yeux.
+
 %description gl-extras
 A modular screen saver and locker for the X Window System.
 This package contains a variety of OpenGL-based (3D) screen
 savers for your mind-numbing, ambition-eroding, time-wasting,
 hypnotized viewing pleasure.
 
+%description -l fr gl-extras
+Un Ã©conomiseur d'Ã©cran modulaire pour le systÃ¨me X Window.
+Ce paquet contient une plÃ©thore d'Ã©conomiseurs d'Ã©cran basÃ©s sur OpenGL (3D)
+pour votre plaisir des yeux.
+
 %description extras-gss
 This package contains desktop files of extras screensavers
 for gnome-screensaver compatibility.
@@ -119,23 +131,14 @@
 
 
 %prep
-%setup -q 
+%setup -q -n %{name}-%{version}%{?beta_ver}
 
-%patch0 -p1 -b .browser-setting
 %patch1 -p1 -b .sanitize-hacks
-%patch5 -p1 -b .rootpasswd
 %patch8 -p1 -b .include-dir
-%patch101 -p1 -b .locale-fix-strict
-%patch102 -p1 -b .matherr2
-%patch104 -p1 -b .xmlfix
-%patch105 -p1 -b .text-locale
-%patch110 -p1 -b .fix-hacks
-%patch111 -p1 -b .kill-getimage
-%patch112 -p1 -b .po-dir
-#%%patch113 -p1 -b .localesegv
-%patch114 -p1 -b .popup_passwin
-
-install -c -m644 -p %{SOURCE10} po/ja.po
+# don't apply for now
+%if %{allow_non_passwd}
+%patch114 -p1 -b .non-passwd
+%endif
 
 change_option(){
    set +x
@@ -237,6 +240,9 @@
 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"
@@ -249,7 +255,7 @@
 ( cd po ; make generate_potfiles_in update-po )
 %endif
 
-make
+make %{?_smp_mflags}
 
 %install
 archdir=`./config.guess`
@@ -283,7 +289,7 @@
 
 # Generate three lists of files for the three packages.
 #
-dd=%{_builddir}/%{name}-%{version}
+dd=%{_builddir}/%{name}-%{version}%{?beta_ver}
 (  cd hacks     ; list_files install ) >  $dd/extras.files
 (  cd hacks/glx ; list_files install ) >  $dd/gl-extras.files
 (  cd driver    ; list_files install ) >  $dd/base.files
@@ -328,7 +334,7 @@
      sed -e '/_description/q' | sed -e '/_description/d'`"
    COMMENT=`echo $COMMENT`
 
-   if [ x$NAME = x ] ; then NAME=$COMMAND ; fi
+   if [ "x$NAME" = "x" ] ; then NAME=$COMMAND ; fi
 
    rm -f $2
    echo "[Desktop Entry]" >> $2
@@ -389,6 +395,16 @@
 %defattr(-,root,root)
 
 %changelog
+* Tue Sep 19 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.01-1
+- 5.01
+- Revert non-passwd auth patch and disable it for now (see bug #205669)
+
+* Sun Sep 17 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.01-0.a1.2
+- 5.01a1
+- Revert lang related patch (still needing some works)
+- Disable small scale window (patch from upstream)
+- Disable non-password authentication.
+
 * Sun Sep 10 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-22
 - Fix Patch114.
 


--- xscreensaver-5.00-browser-setting.patch DELETED ---


--- xscreensaver-5.00-fix-hacks.patch DELETED ---


--- xscreensaver-5.00-ja.po DELETED ---


--- xscreensaver-5.00-kill-getimage.patch DELETED ---


--- xscreensaver-5.00-localefix-restrict.patch DELETED ---


--- xscreensaver-5.00-matherr-utils.patch DELETED ---


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


--- xscreensaver-5.00-po-correctdir.patch DELETED ---


--- xscreensaver-5.00-rootpasswd.patch DELETED ---


--- xscreensaver-5.00-text-locale.patch DELETED ---


--- xscreensaver-5.00-xmlmanfix.patch DELETED ---


