- moved xdm/xdm-np PAM files to /usr/etc/pam.d, since lightdm has

been adjusted meanwhile

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=222
This commit is contained in:
Stefan Dirsch 2020-09-29 10:03:13 +00:00 committed by Git OBS Bridge
parent d3e5eee4b4
commit eb81bd1588
2 changed files with 12 additions and 8 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Sep 29 09:57:42 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- moved xdm/xdm-np PAM files to /usr/etc/pam.d, since lightdm has
been adjusted meanwhile
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 15 10:16:41 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org> Tue Sep 15 10:16:41 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -124,8 +124,7 @@ tar xf %{SOURCE1}
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
### authentification error with lightdm when using /usr/etc/pam.d mv etc/pam.d usr/etc/
#mv etc/pam.d usr/etc/
rmdir etc/X11/xdm etc/X11 rmdir etc/X11/xdm etc/X11
%else %else
patch -p0 < %{PATCH4} patch -p0 < %{PATCH4}
@ -222,14 +221,13 @@ 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
### authentification failure with lightdm when using /usr/etc/pam.d %if 0%{?UsrEtcMove}
#%if 0%{?UsrEtcMove} %{_distconfdir}/pam.d/xdm
#%{_distconfdir}/pam.d/xdm %{_distconfdir}/pam.d/xdm-np
#%{_distconfdir}/pam.d/xdm-np %else
#%else
%config(noreplace) %{_sysconfdir}/pam.d/xdm %config(noreplace) %{_sysconfdir}/pam.d/xdm
%config(noreplace) %{_sysconfdir}/pam.d/xdm-np %config(noreplace) %{_sysconfdir}/pam.d/xdm-np
#%endif %endif
%dir %{_localstatedir}/lib/xdm/ %dir %{_localstatedir}/lib/xdm/
%{_fillupdir}/sysconfig.displaymanager %{_fillupdir}/sysconfig.displaymanager
%{_localstatedir}/lib/xdm/authdir/ %{_localstatedir}/lib/xdm/authdir/