SHA256
1
0
forked from pool/xdm

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:
Stefan Dirsch 2012-08-17 13:33:23 +00:00 committed by Git OBS Bridge
parent 1e7004fe19
commit 1a0b683a6a
4 changed files with 32 additions and 2 deletions

3
xdm-fallbacks.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:29ee58cb0c7923f7390e6e77e8fafab1e5e0c77ce7013680617a74403dbe66e4
size 1050

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Aug 16 17:41:12 CEST 2012 - msrb@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 - msrb@suse.cz
- /etc/init.d/xdm: add plymouth_quit function, use it in xdm
displaymanager file (bnc#775548)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 7 09:11:51 UTC 2012 - sndirsch@suse.com Tue Aug 7 09:11:51 UTC 2012 - sndirsch@suse.com

View File

@ -18,6 +18,12 @@
%define _dminitdir %{_libexecdir}/X11/displaymanagers %define _dminitdir %{_libexecdir}/X11/displaymanagers
%if 0%{?suse_version} < 01210
%define dm_fallbacks 1
%else
%define dm_fallbacks 0
%endif
Name: xdm Name: xdm
Version: 1.1.10 Version: 1.1.10
Release: 0 Release: 0
@ -28,6 +34,9 @@ Url: http://xorg.freedesktop.org/
Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
Source1: xdm.tar.bz2 Source1: xdm.tar.bz2
Source2: HOWTO.xdm Source2: HOWTO.xdm
%if %dm_fallbacks
Source3: xdm-fallbacks.tar.bz2
%endif
Patch0: xdm-consolekit.diff Patch0: xdm-consolekit.diff
Patch1: xdm-tolerant-hostname-changes.diff Patch1: xdm-tolerant-hostname-changes.diff
Patch2: U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch 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} pushd %{buildroot}
# SuSE default XDM configuration # SuSE default XDM configuration
tar xf %{SOURCE1} tar xf %{SOURCE1}
%if %dm_fallbacks
tar xf %{SOURCE3}
%endif
%ifarch s390 s390x %ifarch s390 s390x
sed -i -e "s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\"yes\"+g" \ sed -i -e "s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\"yes\"+g" \
-e "s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\"no\"+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 %doc HOWTO.xdm
%dir %{_dminitdir} %dir %{_dminitdir}
%{_dminitdir}/xdm %{_dminitdir}/xdm
%if %dm_fallbacks
%{_dminitdir}/entrance.fallback %{_dminitdir}/entrance.fallback
%{_dminitdir}/gdm.fallback %{_dminitdir}/gdm.fallback
%{_dminitdir}/kdm.fallback %{_dminitdir}/kdm.fallback
%{_dminitdir}/lxdm.fallback %{_dminitdir}/lxdm.fallback
%{_dminitdir}/slim.fallback %{_dminitdir}/slim.fallback
%{_dminitdir}/wdm.fallback %{_dminitdir}/wdm.fallback
%endif
%config %{_sysconfdir}/X11/xdm/ %config %{_sysconfdir}/X11/xdm/
%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/xdmcp %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/xdmcp
%{_sysconfdir}/init.d/xdm %{_sysconfdir}/init.d/xdm

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:2aa84ab5aa3b9c2edc7252b789f0fdbec6072bd6764b97b8b5c62dea32bf7d44 oid sha256:25b3f419e5790c65c5f06989bf7e48b918b68e3cbea8386f186065d8ced28a67
size 19069 size 18530