[xscreensaver/f14/master] - Update to 5.12

[Mamoru Tasaka]

commit bf1e066eb81a20f3227576f5124a908d486175ea
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Fri Sep 17 06:36:42 2010 +0900

    - Update to 5.12

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 ...er-5.11-no-window2-MappingNotify-bz587537.patch |   12 -----
 xscreensaver-5.11-ripple-sinc.patch                |   19 --------
 xscreensaver-5.11-undefined-behavior.patch         |   16 -------
 xscreensaver-5.11-usepo_again.patch                |   13 ------
 xscreensaver-5.11-xjack-with-small-window.patch    |   28 ------------
 ...aver-5.12-for-now-set-lang-on-daemon-to-C.patch |   14 ++++++
 xscreensaver.spec                                  |   45 ++++++++++---------
 9 files changed, 40 insertions(+), 110 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 10bb236..0c26c0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 xscreensaver-5.11.tar.gz
+/xscreensaver-5.12.tar.gz
diff --git a/sources b/sources
index 7d8450e..c97a843 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-80f981b86734ccb31c5b3b24af3930ae  xscreensaver-5.11.tar.gz
+0345c1acb9280729de05c5ca44b401e3  xscreensaver-5.12.tar.gz
diff --git a/xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch b/xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch
new file mode 100644
index 0000000..0272fc8
--- /dev/null
+++ b/xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch
@@ -0,0 +1,14 @@
+--- xscreensaver-5.12/driver/xscreensaver.c.lang	2010-09-15 17:43:27.000000000 +0900
++++ xscreensaver-5.12/driver/xscreensaver.c	2010-09-17 06:22:22.000000000 +0900
+@@ -1382,6 +1382,11 @@
+   struct passwd *spasswd;
+   int i;
+ 
++/* For now set LANG to C because
++   password prompt shows somw garbage character
++ */
++  setenv("LANG", "C", 1);
++
+ #ifdef ENABLE_NLS
+   if (!setlocale (LC_ALL, ""))
+     fprintf (stderr, "locale not supported by C library\n");
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 68f3b5b..a8e6122 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -1,13 +1,13 @@
 %define name          xscreensaver
 
-%define mainversion   5.11
+%define mainversion   5.12
 %define beta_ver      %{nil}
 
 
 %define modular_conf  1
-%define fedora_rel    9
+%define fedora_rel    1
 
-%define extrarel      .respin1
+%undefine extrarel
 
 %if 0%{?fedora} >= 12
 %define default_text  %{_datadir}/doc/HTML/readme/en_US/README-en_US.txt
@@ -53,21 +53,11 @@ Patch21:         xscreensaver-5.11-webcollage-default-nonet.patch
 ## Patches already sent to the upsteam
 # Remove "AC_PROG_CC' was expanded before it was required" warning
 Patch30:         xscreensaver-5.11-conf264.patch
-# bug 587537
-# hacks crash with no window2 when MappingNotify or so is received
-Patch31:         xscreensaver-5.11-no-window2-MappingNotify-bz587537.patch
-# bug 603587
-# xjack crashes with too small window
-# (Patch32 was revised by the upstream)
-# (and again revised on Fedora)
-Patch32:         xscreensaver-5.11-xjack-with-small-window.patch
-# gcc45 emits new undefined behavior warnings
-Patch33:         xscreensaver-5.11-undefined-behavior.patch
 #
-## Patches to be sent to the upsteam
-# Fix sinc (in ripple.c) function when window is small
-# may fix bug 622188
-Patch34:         xscreensaver-5.11-ripple-sinc.patch
+## Patches which must be discussed with upstream
+# For now set LANG to C for daemon because some garbage character appears
+# on passwd prompt
+Patch31:         xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch
 #
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
@@ -90,9 +80,13 @@ BuildRequires:   xorg-x11-proto-devel
 BuildRequires:   libX11-devel
 BuildRequires:   libXScrnSaver-devel
 BuildRequires:   libXext-devel
+# From xscreensaver 5.12, write explicitly
+BuildRequires:   libXi-devel
 BuildRequires:   libXinerama-devel
 BuildRequires:   libXmu-devel
 BuildRequires:   libXpm-devel
+# Write explicitly
+BuildRequires:   libXrandr-devel
 BuildRequires:   libXt-devel
 BuildRequires:   libXxf86misc-devel
 BuildRequires:   libXxf86vm-devel
@@ -102,6 +96,10 @@ BuildRequires:   libglade2-devel
 %if 0%{?fedora}
 BuildRequires:   fedora-release-notes
 %endif
+# For --with-login-manager option
+%if 0%{?fedora} >= 14
+BuildRequires:   gdm
+%endif
 Requires:        %{_sysconfdir}/pam.d/system-auth
 Requires:        pam > %{pam_ver}
 Requires:        xdg-utils
@@ -225,10 +223,7 @@ This package contains some test programs to debug XScreenSaver.
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
 %patch30 -p1 -b .conf264
-%patch31 -p1 -b .nowin2_sig
-%patch32 -p1 -b .xjack_smallwin
-%patch33 -p1 -b .undef
-%patch34 -p1 -b .ripple_sinc
+%patch31 -p1 -b .langc
 
 change_option(){
    set +x
@@ -373,6 +368,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"
 CONFIG_OPTS="$CONFIG_OPTS --with-browser=xdg-open"
+# From xscreensaver 5.12, login-manager option is on by default
+# For now, let's enable it from F-14 and above
+%if 0%{?fedora} < 14
+CONFIG_OPTS="$CONFIG_OPTS --without-login-manager"
+%endif
 
 # This is flaky:
 # CONFIG_OPTS="$CONFIG_OPTS --with-login-manager"
@@ -709,6 +709,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Sep 17 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.12-1
+- Update to 5.12
+
 * Mon Aug  9 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-9.respin1
 - Fix sinc() (in ripple.c) argument when window is small
   (may fix bug 622188)