[xscreensaver] - Update Patch 31 (xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch) - Reduce BR using pseudo

[Mamoru Tasaka]

commit 8675b13ceb85fb968748a0c1191b83a19e542898
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Mon Sep 20 02:18:24 2010 +0900

    - Update Patch 31 (xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch)
    - Reduce BR using pseudo symlink

 ...aver-5.12-for-now-set-lang-on-daemon-to-C.patch |   20 +++++++-----
 xscreensaver.spec                                  |   32 ++++++++++++++++---
 2 files changed, 39 insertions(+), 13 deletions(-)
---
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
index 0272fc8..b422c9d 100644
--- 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
@@ -1,14 +1,18 @@
---- 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 @@
+--- xscreensaver-5.12/driver/xscreensaver.c.debug	2010-09-15 17:43:27.000000000 +0900
++++ xscreensaver-5.12/driver/xscreensaver.c	2010-09-20 01:33:26.000000000 +0900
+@@ -1382,6 +1382,7 @@
    struct passwd *spasswd;
    int i;
  
-+/* For now set LANG to C because
-+   password prompt shows somw garbage character
-+ */
-+  setenv("LANG", "C", 1);
-+
++#if 0
  #ifdef ENABLE_NLS
    if (!setlocale (LC_ALL, ""))
      fprintf (stderr, "locale not supported by C library\n");
+@@ -1389,6 +1390,7 @@
+   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+   textdomain (GETTEXT_PACKAGE);
+ #endif /* ENABLE_NLS */
++#endif
+ 
+   memset(si, 0, sizeof(*si));
+   global_si_kludge = si;	/* I hate C so much... */
diff --git a/xscreensaver.spec b/xscreensaver.spec
index a8e6122..ed93a7b 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    1
+%define fedora_rel    2
 
 %undefine extrarel
 
@@ -75,7 +75,8 @@ BuildRequires:   gettext
 BuildRequires:   libtool
 BuildRequires:   pam-devel > %{pam_ver}
 BuildRequires:   sed
-BuildRequires:   xdg-utils
+# Use pseudo symlink
+# BuildRequires:   xdg-utils
 BuildRequires:   xorg-x11-proto-devel
 BuildRequires:   libX11-devel
 BuildRequires:   libXScrnSaver-devel
@@ -98,7 +99,8 @@ BuildRequires:   fedora-release-notes
 %endif
 # For --with-login-manager option
 %if 0%{?fedora} >= 14
-BuildRequires:   gdm
+# Use pseudo symlink, not writing BR: gdm
+#BuildRequires:   gdm
 %endif
 Requires:        %{_sysconfdir}/pam.d/system-auth
 Requires:        pam > %{pam_ver}
@@ -360,6 +362,17 @@ archdir=`./config.guess`
 [ -d $archdir ] || mkdir $archdir
 cd $archdir
 
+# Create temporary path and symlink
+rm -rf ./TMPBINDIR
+
+mkdir TMPBINDIR
+pushd TMPBINDIR/
+export PATH=$(pwd):$PATH
+
+# xdg-open
+ln -sf /bin/true xdg-open
+popd
+
 export CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}"
 
 CONFIG_OPTS="--prefix=%{_prefix} --with-pam --without-shadow --without-kerberos"
@@ -369,8 +382,13 @@ 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
+# For now, let's enable it on F-14 and above
+%if 0%{?fedora} >= 14
+pushd TMPBINDIR
+ln -sf /bin/true gdmflexiserver
+export PATH=$(pwd):$PATH
+popd
+%else
 CONFIG_OPTS="$CONFIG_OPTS --without-login-manager"
 %endif
 
@@ -709,6 +727,10 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Mon Sep 20 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.12-2
+- Update Patch 31 (xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch)
+- Reduce BR using pseudo symlink
+
 * Fri Sep 17 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.12-1
 - Update to 5.12