OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/x11-tools?expand=0&rev=10

x11-tools.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Nov 03 14:00:08 CET 2008 - mfabian@suse.de
+
+- bnc#440371: /etc/X11/xim: if gdm passes the language
+  to Xsession as the second argument, we should not override this
+  in xim.
+
 -------------------------------------------------------------------
 Thu Oct 23 14:15:29 CEST 2008 - mfabian@suse.de
 

x11-tools.spec

@@ -26,7 +26,7 @@ Provides:       xf86tools
 Obsoletes:      xf86tools
 AutoReqProv:    on
 Version:        0.1
-Release:        165
+Release:        166
 Summary:        Tools for the X Window System
 Source2:        xf86debug
 Source6:        wmlist
@@ -52,7 +52,6 @@ Authors:
 %build
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/bin/
 install -m 755 $RPM_SOURCE_DIR/xf86debug      $RPM_BUILD_ROOT/usr/bin
 install -m 755 $RPM_SOURCE_DIR/wmlist         $RPM_BUILD_ROOT/usr/bin
@@ -80,6 +79,10 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var
 /var/adm/fillup-templates/sysconfig.language-%{name}
 
 %changelog
+* Mon Nov 03 2008 mfabian@suse.de
+- bnc#440371: /etc/X11/xim: if gdm passes the language
+  to Xsession as the second argument, we should not override this
+  in xim.
 * Thu Oct 23 2008 mfabian@suse.de
 - bnc#413879: /etc/X11/xim: make sure that GTK_IM_MODULE is always
   set to something, input of German umlauts in acroread doesn’t
@@ -137,7 +140,7 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var
   the rename.
 - rename the documentation directory to the current name of the
   package.
-* Tue Sep 20 2005 sndirsch@suse.de
+* Mon Sep 19 2005 sndirsch@suse.de
 - fixed build
 * Sun Sep 18 2005 sndirsch@suse.de
 - NVIDIA_kernel-1.0-7676-1359015.diff.txt:
@@ -165,7 +168,7 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var
 - updated nvidia driver to release 1.0-7676 (IA32 and AMD64)
   * Fixed GeForce 7800 GTX clocking problem that affected 3D
   performance.
-* Mon Aug 08 2005 sndirsch@suse.de
+* Sun Aug 07 2005 sndirsch@suse.de
 - link-fglrx-module:
   * libfglrx_ip.a.GCC3-<version> --> libfglrx_ip.a.GCC4-<version>
 * Tue Jul 26 2005 sndirsch@suse.de
@@ -221,7 +224,7 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var
   This patch fixes 2D/3D performance problems when using the Linux
   AGP driver, AGPGART; the built-in NVIDIA AGP driver, NvAGP, is
   not affected by this problem.
-* Thu Mar 03 2005 sndirsch@suse.de
+* Wed Mar 02 2005 sndirsch@suse.de
 - updated nvidia driver to release 1.0-7167 (IA32 and AMD64)
 * Mon Feb 28 2005 sndirsch@suse.de
 - removed sux; replaced by a symlink to su in coreutils package
@@ -284,7 +287,7 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var
   patch :-)
 * Wed Sep 01 2004 sndirsch@suse.de
 - fixed PreReq for /lib/modules/scripts/nvidia.sh (Bug #44553)
-* Thu Aug 26 2004 sndirsch@suse.de
+* Wed Aug 25 2004 sndirsch@suse.de
 - removed %%pre; removing symlinks xf86config and xinit no longer
   makes sense; it even is completely wrong (Bug #44230)
 * Mon Aug 23 2004 schwab@suse.de
@@ -345,9 +348,9 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var
 * Wed Mar 24 2004 sndirsch@suse.de
 - added sysconfig variables to configure if TTCap entries in
   fonts.dir and ghostscript fontmaps are generated by fonts-config
-* Sat Mar 20 2004 sndirsch@suse.de
+* Fri Mar 19 2004 sndirsch@suse.de
 - removed .orig files to fix build
-* Sat Mar 13 2004 sndirsch@suse.de
+* Fri Mar 12 2004 sndirsch@suse.de
 - fonts-config: call checkproc with absolute path (Bug #35708)
 * Mon Mar 08 2004 sndirsch@suse.de
 - udated to nvidia-installer release 1.0.6 (kernel 2.6 support
@@ -490,7 +493,7 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var
 - nvidia.sh:
   * /lib/modules/nvidia/nv-kernel.o -->
   /lib/modules/scripts/nvidia/nv-kernel.o
-* Tue Sep 16 2003 sndirsch@suse.de
+* Mon Sep 15 2003 sndirsch@suse.de
 - added km_nvidia package (nvidia kernel interface)
 - added link-nvidia-module; script, which links nvidia kernel
   interface (nv-linux.o) and binary-only part (nv-kernel.o) to
@@ -700,7 +703,7 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var
   applications to work (Bug #16562)
 * Tue Aug 27 2002 sndirsch@suse.de
 - fixed numlock program: KeyRelease event was missing
-* Sat Aug 17 2002 sndirsch@suse.de
+* Fri Aug 16 2002 sndirsch@suse.de
 - adjusted fetchmsttfonts: simply prints a message, that MS
   discontinued the Web fonts program
 - removed fetchmsttfonts.sh
@@ -801,7 +804,7 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var
 - added fallback to "Luxi Mono" for monospaced font requests;
   fixes "konsole" AA font problem (made it unusable), if no MS TT
   fonts are installed
-* Thu Dec 20 2001 sndirsch@suse.de
+* Wed Dec 19 2001 sndirsch@suse.de
 - fetchmsttfonts now creates a fonts.scale.msttfonts file only for
   the TTF files, which are fetched; no duplicate entries any more
   in fonts.scale
@@ -829,7 +832,7 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var
 - moved 'wmlist' script from package susewm to package xf86tools
 * Wed Jul 18 2001 cstein@suse.de
 - added 'xsplash' to wmlist and changed year in file header to 2001
-* Sat Jun 23 2001 sndirsch@suse.de
+* Fri Jun 22 2001 sndirsch@suse.de
 - better error handling in latvian (un)install scripts
 * Tue Jun 19 2001 sndirsch@suse.de
 - added fetchmsttfonts.sh for KDE menu
@@ -842,7 +845,7 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var
   * install/uninstall skript for enabling/disabling latvian support
   (patches XF86Config + Compose table)
   * README.SuSE
-* Thu May 17 2001 sndirsch@suse.de
+* Wed May 16 2001 sndirsch@suse.de
 - rewritten fetchmsttfonts to use cabextract instead of unzip, so
   that the more recent TT Fonts for Windows 9x/NT/2000 can be used
 - added cabextract tool, required for new fetchmsttfonts

xim

@@ -79,7 +79,16 @@ adduserenv () {
     done < <(exec -l -a ${SHELL##*/} $SHELL -c printenv)
 }
 
-adduserenv LANG LC_CTYPE LC_ALL INPUT_METHOD
+# if gdm passes the language to Xsession, we should not override this
+# see http://bugzilla.novell.com/show_bug.cgi?id=440371
+# The test for $GDM_LANG needs to be changed slightly as soon as other
+# displaymanager also pass a second argument to Xsession.
+if test -n "$GDM_LANG" ; then
+    echo "/etc/X11/xim: use GDM_LANG=$GDM_LANG"
+    adduserenv INPUT_METHOD
+else
+    adduserenv LANG LC_CTYPE LC_ALL INPUT_METHOD
+fi
 
 test $extglob -eq 0 && shopt -u extglob