commit xdm for openSUSE:12.2
Hello community,
here is the log from the commit of package xdm for openSUSE:12.2 checked in at
2012-08-23 15:31:59
Comparing /work/SRC/openSUSE:12.2/xdm (Old)
and /work/SRC/openSUSE:12.2/.xdm.new (New)
Package is xdm, Maintainer is
Changes:
--- /work/SRC/openSUSE:12.2/xdm/xdm.changes 2012-08-08 11:45:02.0
+0200
+++ /work/SRC/openSUSE:12.2/.xdm.new/xdm.changes2012-08-23
15:32:05.0 +0200
@@ -1,0 +2,13 @@
+Thu Aug 16 17:41:12 CEST 2012 - m...@suse.cz
+
+- separate *.fallback displaymanager files from xdm.tar.bz2 into
+ xdm-fallbacks.tar.bz2 and build only suse version 1210.
+ (bnc#714003)
+
+---
+Thu Aug 16 15:15:12 CEST 2012 - m...@suse.cz
+
+- /etc/init.d/xdm: add plymouth_quit function, use it in xdm
+ displaymanager file (bnc#775548)
+
+---
New:
xdm-fallbacks.tar.bz2
Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.pz3oCw/_old 2012-08-23 15:32:06.0 +0200
+++ /var/tmp/diff_new_pack.pz3oCw/_new 2012-08-23 15:32:06.0 +0200
@@ -18,6 +18,12 @@
%define _dminitdir %{_libexecdir}/X11/displaymanagers
+%if 0%{?suse_version} 01210
+%define dm_fallbacks 1
+%else
+%define dm_fallbacks 0
+%endif
+
Name: xdm
Version:1.1.10
Release:0
@@ -28,6 +34,7 @@
Source0:
http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
Source1:xdm.tar.bz2
Source2:HOWTO.xdm
+Source3:xdm-fallbacks.tar.bz2
Patch0: xdm-consolekit.diff
Patch1: xdm-tolerant-hostname-changes.diff
Patch2:
U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch
@@ -94,6 +101,9 @@
pushd %{buildroot}
# SuSE default XDM configuration
tar xf %{SOURCE1}
+%if %dm_fallbacks
+tar xf %{SOURCE3}
+%endif
%ifarch s390 s390x
sed -i -e
s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\yes\+g \
-e
s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\no\+g \
@@ -131,12 +141,14 @@
%doc HOWTO.xdm
%dir %{_dminitdir}
%{_dminitdir}/xdm
+%if %dm_fallbacks
%{_dminitdir}/entrance.fallback
%{_dminitdir}/gdm.fallback
%{_dminitdir}/kdm.fallback
%{_dminitdir}/lxdm.fallback
%{_dminitdir}/slim.fallback
%{_dminitdir}/wdm.fallback
+%endif
%config %{_sysconfdir}/X11/xdm/
%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/xdmcp
%{_sysconfdir}/init.d/xdm
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/init.d/xdm new/etc/init.d/xdm
--- old/etc/init.d/xdm 2012-08-07 11:11:20.0 +0200
+++ new/etc/init.d/xdm 2012-08-17 14:42:34.0 +0200
@@ -125,6 +125,14 @@
fi
}
+plymouth_quit()
+{
+if [ -x /usr/bin/plymouth ]; then
+plymouth quit
+plymouth --wait
+fi
+}
+
#set -x
DM=${DISPLAYMANAGER##*/}
@@ -200,17 +208,6 @@
rc_exit
fi
fi
- case $DM in
- kdm|gdm)
- # KDE and GNOME have own plymouth integration
- ;;
- *)
- if [ -x /usr/bin/plymouth ]; then
- plymouth quit
- plymouth --wait
- fi
- ;;
- esac
startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed
# After a crash or a kill signal we may have
# a wrong ownership of /dev/xconsole
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/usr/lib/X11/displaymanagers/entrance.fallback
new/usr/lib/X11/displaymanagers/entrance.fallback
--- old/usr/lib/X11/displaymanagers/entrance.fallback 2011-09-26
15:10:04.0 +0200
+++ new/usr/lib/X11/displaymanagers/entrance.fallback 1970-01-01
01:00:00.0 +0100
@@ -1,10 +0,0 @@
-entrance_vars () {
-case $1 in
-entrance)
- DISPLAYMANAGER=/usr/sbin/entranced
- ;;
- *)
- return 1
-esac
-return 0
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/usr/lib/X11/displaymanagers/gdm.fallback
new/usr/lib/X11/displaymanagers/gdm.fallback
--- old/usr/lib/X11/displaymanagers/gdm.fallback2011-09-07
11:38:33.0 +0200
+++ new/usr/lib/X11/displaymanagers/gdm.fallback1970-01-01
01:00:00.0 +0100
@@ -1,24 +0,0 @@
-gdm_start_proc () {
-if [ $DISPLAYMANAGER_REMOTE_ACCESS = yes -a \
- $DISPLAYMANAGER_STARTS_XSERVER = no ]; then
- XDMOPTIONS=--no-console
-fi
-splashcopy 0 6
-return 0
-}
-
-gdm_vars() {
-case ${DISPLAYMANAGER##*/} in
- gdm|GDM|Gnome|GNOME)
-
commit xdm for openSUSE:12.2
Hello community, here is the log from the commit of package xdm for openSUSE:12.2 checked in at 2012-08-08 11:44:59 Comparing /work/SRC/openSUSE:12.2/xdm (Old) and /work/SRC/openSUSE:12.2/.xdm.new (New) Package is xdm, Maintainer is Changes: --- /work/SRC/openSUSE:12.2/xdm/xdm.changes 2012-07-30 02:37:15.0 +0200 +++ /work/SRC/openSUSE:12.2/.xdm.new/xdm.changes2012-08-08 11:45:02.0 +0200 @@ -1,0 +2,6 @@ +Tue Aug 7 09:11:51 UTC 2012 - sndir...@suse.com + +- /etc/init.d/xdm: overwrite displaymanager's PIDFILE symlink if + neccessary (bnc#774555) + +--- Other differences: -- ++ xdm.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/init.d/xdm new/etc/init.d/xdm --- old/etc/init.d/xdm 2012-07-01 09:47:02.0 +0200 +++ new/etc/init.d/xdm 2012-08-07 11:11:20.0 +0200 @@ -221,7 +221,7 @@ chown root:tty /dev/xconsole /dev/tty0 chmod 622 /dev/xconsole /dev/tty0 fi - ln -s $PIDFILE $PIDFILELNK + ln -snf $PIDFILE $PIDFILELNK fi rc_status -v ;; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xdm for openSUSE:12.2
Hello community,
here is the log from the commit of package xdm for openSUSE:12.2 checked in at
2012-07-02 11:20:46
Comparing /work/SRC/openSUSE:12.2/xdm (Old)
and /work/SRC/openSUSE:12.2/.xdm.new (New)
Package is xdm, Maintainer is
Changes:
--- /work/SRC/openSUSE:12.2/xdm/xdm.changes 2012-06-25 15:57:58.0
+0200
+++ /work/SRC/openSUSE:12.2/.xdm.new/xdm.changes2012-07-02
11:20:48.0 +0200
@@ -1,0 +2,22 @@
+Sat Jun 30 21:29:37 CEST 2012 - ti...@suse.de
+
+- avoid plymouth quit for kdm and gdm (bnc#762909)
+
+---
+Fri Jun 29 16:23:12 CEST 2012 - ti...@suse.de
+
+- remove --retain-splash option from plymouth quit (bnc#769209)
+
+---
+Fri Jun 29 14:11:47 UTC 2012 - sndir...@suse.com
+
+- /etc/init.d/xdm
+ * quit plymouth properly before starting displaymanager
+(bnc#769209)
+
+---
+Mon Jun 18 13:38:34 UTC 2012 - wer...@suse.de
+
+- Skip LANG argument from command line of session managers (bnc#661946)
+
+---
Other differences:
--
++ xdm.spec ++
--- /var/tmp/diff_new_pack.9v7Oio/_old 2012-07-02 11:20:48.0 +0200
+++ /var/tmp/diff_new_pack.9v7Oio/_new 2012-07-02 11:20:48.0 +0200
@@ -21,10 +21,10 @@
Name: xdm
Version:1.1.10
Release:0
-License:MIT
Summary:X Display Manager
-Url:http://xorg.freedesktop.org/
+License:MIT
Group: System/X11/Utilities
+Url:http://xorg.freedesktop.org/
Source0:
http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
Source1:xdm.tar.bz2
Source2:HOWTO.xdm
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/X11/xdm/Xsession new/etc/X11/xdm/Xsession
--- old/etc/X11/xdm/Xsession2010-12-03 18:42:07.0 +0100
+++ new/etc/X11/xdm/Xsession2012-06-18 15:36:04.0 +0200
@@ -64,8 +64,6 @@
IFS=$OIFS
fi
-readonly argv
-
#
# Disable graphical login if normal login is disabled
#
@@ -170,7 +168,9 @@
*) forced=yes
WINDOWMANAGER=${argv[0]} ;;
esac
-for l ; do
+typeset -i argc=0
+for l in ${#argv[@]} ; do
+ let argc++ || :
case $l in
[a-z][a-z]_[A-Z][A-Z]*)
LANG=$l
@@ -178,11 +178,15 @@
break
esac
done
+unset argv[$argc]
unset l
+readonly argv
# get the system default locale settings:
if test -z $LANG -a -f /etc/profile.d/lang.sh ; then
. /etc/profile.d/lang.sh
fi
+else
+readonly argv
fi
# If LANG is still not set, get the system default locale settings:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/init.d/xdm new/etc/init.d/xdm
--- old/etc/init.d/xdm 2011-11-08 10:21:56.0 +0100
+++ new/etc/init.d/xdm 2012-07-01 09:47:02.0 +0200
@@ -200,6 +200,17 @@
rc_exit
fi
fi
+ case $DM in
+ kdm|gdm)
+ # KDE and GNOME have own plymouth integration
+ ;;
+ *)
+ if [ -x /usr/bin/plymouth ]; then
+ plymouth quit
+ plymouth --wait
+ fi
+ ;;
+ esac
startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed
# After a crash or a kill signal we may have
# a wrong ownership of /dev/xconsole
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
