Hello community,
here is the log from the commit of package xdm for openSUSE:Factory checked in
at 2012-08-23 15:31:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xdm (Old)
and /work/SRC/openSUSE:Factory/.xdm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdm", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/xdm/xdm.changes 2012-08-08 11:44:53.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2012-08-23
15:32:01.000000000 +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.aTDdYn/_old 2012-08-23 15:32:05.000000000 +0200
+++ /var/tmp/diff_new_pack.aTDdYn/_new 2012-08-23 15:32:05.000000000 +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.000000000 +0200
+++ new/etc/init.d/xdm 2012-08-17 14:42:34.000000000 +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.000000000 +0200
+++ new/usr/lib/X11/displaymanagers/entrance.fallback 1970-01-01
01:00:00.000000000 +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.fallback 2011-09-07
11:38:33.000000000 +0200
+++ new/usr/lib/X11/displaymanagers/gdm.fallback 1970-01-01
01:00:00.000000000 +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)
- RELOADSIGNAL="-USR1"
- if [ -x /usr/sbin/gdm ]; then
- DISPLAYMANAGER=/usr/sbin/gdm
- else
- DISPLAYMANAGER=/opt/gnome/sbin/gdm
- fi
- STARTPROC=gdm_start_proc
- ;;
- *) return 1 ;;
- esac
- return 0
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/usr/lib/X11/displaymanagers/kdm.fallback
new/usr/lib/X11/displaymanagers/kdm.fallback
--- old/usr/lib/X11/displaymanagers/kdm.fallback 2011-09-07
11:37:30.000000000 +0200
+++ new/usr/lib/X11/displaymanagers/kdm.fallback 1970-01-01
01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-kdm_start_proc() {
- splashcopy 0 6
- return 0
-}
-
-kdm_vars() {
- KDM4_BIN=/usr/bin/kdm
- KDM_BIN=/opt/kde3/bin/kdm
- case "${DISPLAYMANAGER##*/}" in
- kdm3)
- export KDEROOTHOME=/root/.kdm
- DISPLAYMANAGER=$KDM_BIN
- STARTPROC=kdm_start_proc
- ;;
- kdm|kde|KDM|KDE)
- export KDEROOTHOME=/root/.kdm
- DISPLAYMANAGER=$KDM_BIN
- if [ ! -r "$DISPLAYMANAGER" ]; then
- DISPLAYMANAGER=$KDM4_BIN
- fi
- STARTPROC=kdm_start_proc
- ;;
- kdm4)
- export KDEROOTHOME=/root/.kdm
- DISPLAYMANAGER=$KDM4_BIN
- STARTPROC=kdm_start_proc
- ;;
- *) return 1 ;;
- esac
- return 0
-}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/usr/lib/X11/displaymanagers/lxdm.fallback
new/usr/lib/X11/displaymanagers/lxdm.fallback
--- old/usr/lib/X11/displaymanagers/lxdm.fallback 2011-09-06
13:30:42.000000000 +0200
+++ new/usr/lib/X11/displaymanagers/lxdm.fallback 1970-01-01
01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-lxdm_start_proc() {
- xdm_reload_files
- return $?
-}
-
-lxdm_vars() {
- case $1 in
- lxdm|LXDM)
- DISPLAYMANAGER=/usr/bin/lxdm
- XDMOPTIONS=-d
- STARTPROC=lxdm_start_proc
- RELOADPROC=lxdm_start_proc
- ;;
- *)
- return 1
- ;;
- esac
- return 0
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/usr/lib/X11/displaymanagers/slim.fallback
new/usr/lib/X11/displaymanagers/slim.fallback
--- old/usr/lib/X11/displaymanagers/slim.fallback 2011-10-14
13:46:09.000000000 +0200
+++ new/usr/lib/X11/displaymanagers/slim.fallback 1970-01-01
01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-slim_start_proc() {
- xdm_reload_files
- return $?
-}
-
-slim_vars() {
- case $1 in
- slim|SLIM)
- DISPLAYMANAGER=/usr/bin/slim
- PIDFILE=/var/run/slim.lock
- XDMOPTIONS=-d
- STARTPROC=slimdm_start_proc
- RELOADPROC=slimdm_start_proc
- ;;
- *)
- return 1
- ;;
- esac
- return 0
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/usr/lib/X11/displaymanagers/wdm.fallback
new/usr/lib/X11/displaymanagers/wdm.fallback
--- old/usr/lib/X11/displaymanagers/wdm.fallback 2011-09-20
15:43:23.000000000 +0200
+++ new/usr/lib/X11/displaymanagers/wdm.fallback 1970-01-01
01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-wdm_start_proc () {
- xdm_reload_files
- return $?
-}
-
-wdm_vars() {
- WDM_BIN=/usr/bin/wdm
-
- case "${DISPLAYMANAGER##*/}" in
- wdm|WDM)
- DISPLAYMANAGER=$WDM_BIN
- STARTPROC=wdm_start_proc
- ;;
- *)
- return 1 ;;
- esac
-
- return 0
-}
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/usr/lib/X11/displaymanagers/xdm
new/usr/lib/X11/displaymanagers/xdm
--- old/usr/lib/X11/displaymanagers/xdm 2011-08-25 12:11:44.000000000 +0200
+++ new/usr/lib/X11/displaymanagers/xdm 2012-08-16 16:52:26.000000000 +0200
@@ -1,4 +1,5 @@
xdm_start_proc() {
+ plymouth_quit
xdm_reload_files
return $?
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
