Accepting request 131100 from home:michalsrb:branches:X11:XOrg
- separate *.fallback displaymanager files from xdm.tar.bz2 into xdm-fallbacks.tar.bz2 and build only suse version < 1210. (bnc#714003) - /etc/init.d/xdm: add plymouth_quit function, use it in xdm displaymanager file (bnc#775548) OBS-URL: https://build.opensuse.org/request/show/131100 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=12
This commit is contained in:
14
xdm.spec
14
xdm.spec
@@ -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,9 @@ Url: http://xorg.freedesktop.org/
|
||||
Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
|
||||
Source1: xdm.tar.bz2
|
||||
Source2: HOWTO.xdm
|
||||
%if %dm_fallbacks
|
||||
Source3: xdm-fallbacks.tar.bz2
|
||||
%endif
|
||||
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 +103,9 @@ rm %{buildroot}%{_sysconfdir}/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0}
|
||||
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 +143,14 @@ ln -s ../man7/init.d.7%{?ext_man} %{buildroot}%{_mandir}/man8/rcxdm.8%{?ext_man}
|
||||
%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
|
||||
|
Reference in New Issue
Block a user