pool/xdm
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 545302 from X11:XOrg

Browse Source 
- move /var/adm/fillup-templates/sysconfig.displaymanager
  to %_fillupdir on TW and sle15/Leap 15

- Replace references to /var/adm/fillup-templates with new 
  %_fillupdir macro (boo#1069468)

- xdm.tar.bz2: Fix Xstartup, that couldn't handle env DISPLAY=(null) 
  (bsc#1068016, patch by xwang@suse.com)

OBS-URL: https://build.opensuse.org/request/show/545302
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xdm?expand=0&rev=63
This commit is contained in:
Dominique Leuenberger 2017-11-30 11:38:14 +00:00 committed by Git OBS Bridge
commit 0c0f716e92
3 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xdm.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Thu Nov 23 20:20:50 UTC 2017 - sndirsch@suse.com
- move /var/adm/fillup-templates/sysconfig.displaymanager
to %_fillupdir on TW and sle15/Leap 15
-------------------------------------------------------------------
Thu Nov 23 13:52:48 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
Thu Nov 23 10:46:29 UTC 2017 - sndirsch@suse.com
- xdm.tar.bz2: Fix Xstartup, that couldn't handle env DISPLAY=(null)
(bsc#1068016, patch by xwang@suse.com)
-------------------------------------------------------------------
Fri Oct 27 12:53:19 UTC 2017 - msrb@suse.com

15
xdm.spec
View File

@ -16,6 +16,11 @@
#
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
%define _dminitdir %{_libexecdir}/X11/displaymanagers
%if 0%{?suse_version} > 1230
%define with_systemd 1
@ -143,13 +148,19 @@ tar xf %{SOURCE1}
%if 0%{?suse_version} >= 1330
patch -p1 < %{PATCH2}
%endif
%if "%{_fillupdir}" != "/var/adm/fillup-templates"
mkdir -p %{buildroot}$(dirname %{_fillupdir})
mv %{buildroot}/var/adm/fillup-templates \
%{buildroot}$(dirname %{_fillupdir})
%endif
%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_STARTS_XSERVER=.*+DISPLAYMANAGER_STARTS_XSERVER=\"no\"+g" \
var/adm/fillup-templates/sysconfig.displaymanager
%{buildroot}%{_fillupdir}/sysconfig.displaymanager
%endif
popd
@ -266,7 +277,7 @@ fi
%config(noreplace) %{_sysconfdir}/pam.d/xdm
%config(noreplace) %{_sysconfdir}/pam.d/xdm-np
%dir %{_localstatedir}/lib/xdm/
%{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager
%{_fillupdir}/sysconfig.displaymanager
%{_localstatedir}/lib/xdm/authdir/
%ghost %{_localstatedir}/log/xdm.errors
%{_bindir}/chooser

4
xdm.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e33d18017a26e2f228d5a55dcc045ce3606f9be3e6e5e49fd1ca11984151a2f0
size 23537
oid sha256:d20ee252195873d8eac795edb4d69d2ed6751bfb9c5892fd13ae34542ed2a5f4
size 23572