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

- reverted move to /usr/etc/X11/xdm for now due to boo#1176212

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=214
This commit is contained in:
Stefan Dirsch 2020-09-08 09:40:57 +00:00 committed by Git OBS Bridge
parent 3274dbc317
commit 4ae4b23521
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xdm.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Sep 8 09:29:10 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- reverted move to /usr/etc/X11/xdm for now due to boo#1176212
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Sep 5 03:41:38 UTC 2020 - Stefan Dirsch <sndirsch@suse.com> Sat Sep 5 03:41:38 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>

16
xdm.spec
View File

@ -16,6 +16,8 @@
# #
%define UsrEtcMove 0
#Compat macro for new _fillupdir macro introduced in Nov 2017 #Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir} %if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates %define _fillupdir /var/adm/fillup-templates
@ -102,7 +104,7 @@ autoreconf -fi
%configure \ %configure \
--disable-static \ --disable-static \
--with-pam \ --with-pam \
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove}
--with-xdmconfigdir=%{_distconfdir}/X11/xdm \ --with-xdmconfigdir=%{_distconfdir}/X11/xdm \
--with-xdmscriptdir=%{_distconfdir}/X11/xdm \ --with-xdmscriptdir=%{_distconfdir}/X11/xdm \
%else %else
@ -115,7 +117,7 @@ make %{?_smp_mflags}
%install %install
%make_install %make_install
# Not used anymore by SuSE # Not used anymore by SuSE
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove}
rm %{buildroot}%{_distconfdir}/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0} rm %{buildroot}%{_distconfdir}/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0}
%else %else
rm %{buildroot}%{_sysconfdir}/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0} rm %{buildroot}%{_sysconfdir}/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0}
@ -124,7 +126,7 @@ 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 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove}
patch -p0 < %{PATCH2} patch -p0 < %{PATCH2}
mkdir -p usr/etc/X11/xdm mkdir -p usr/etc/X11/xdm
mv etc/X11/xdm/* usr/etc/X11/xdm mv etc/X11/xdm/* usr/etc/X11/xdm
@ -146,7 +148,7 @@ sed -i -e "s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\"yes\
popd popd
# Correct location (FHS-2.1) # Correct location (FHS-2.1)
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove}
ln -s %{_localstatedir}/lib/xdm/authdir %{buildroot}%{_distconfdir}/X11/xdm/authdir ln -s %{_localstatedir}/lib/xdm/authdir %{buildroot}%{_distconfdir}/X11/xdm/authdir
%else %else
ln -s %{_localstatedir}/lib/xdm/authdir %{buildroot}%{_sysconfdir}/X11/xdm/authdir ln -s %{_localstatedir}/lib/xdm/authdir %{buildroot}%{_sysconfdir}/X11/xdm/authdir
@ -207,13 +209,13 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager
%{_dminitdir}/console %{_dminitdir}/console
/usr/lib/X11/displaymanagers/default-displaymanager /usr/lib/X11/displaymanagers/default-displaymanager
%ghost %{_sysconfdir}/alternatives/default-displaymanager %ghost %{_sysconfdir}/alternatives/default-displaymanager
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove}
%dir %{_distconfdir}/X11 %dir %{_distconfdir}/X11
%{_distconfdir}/X11/xdm/ %{_distconfdir}/X11/xdm/
%else %else
%config %{_sysconfdir}/X11/xdm/ %config %{_sysconfdir}/X11/xdm/
%endif %endif
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove}
%dir %{_distconfdir}/X11/xdm/scripts %dir %{_distconfdir}/X11/xdm/scripts
%else %else
%dir %{_sysconfdir}/X11/xdm/scripts %dir %{_sysconfdir}/X11/xdm/scripts
@ -224,7 +226,7 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager
%{_unitdir}/display-manager.service %{_unitdir}/display-manager.service
/usr/lib/X11/display-manager /usr/lib/X11/display-manager
%config %{_sysconfdir}/logrotate.d/xdm %config %{_sysconfdir}/logrotate.d/xdm
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove}
%{_distconfdir}/pam.d/xdm %{_distconfdir}/pam.d/xdm
%{_distconfdir}/pam.d/xdm-np %{_distconfdir}/pam.d/xdm-np
%else %else