rpm/xdm
SHA256
1
0
Fork 0
forked from pool/xdm
Code Pull Requests Activity

Accepting request 811813 from X11:XOrg

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/811813
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xdm?expand=0&rev=80
This commit is contained in:
Dominique Leuenberger 2020-06-11 07:59:32 +00:00 committed by Git OBS Bridge
commit 01f3e7deba
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xdm.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jun 5 12:12:52 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
- Fixes for %_libexecdir changing to /usr/libexec
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Mar 21 12:44:02 UTC 2020 - Stefan Dirsch <sndirsch@suse.com> Sat Mar 21 12:44:02 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>

34
xdm.spec
View File

@ -21,7 +21,7 @@
%define _fillupdir /var/adm/fillup-templates %define _fillupdir /var/adm/fillup-templates
%endif %endif
%define _dminitdir %{_libexecdir}/X11/displaymanagers %define _dminitdir /usr/lib/X11/displaymanagers
%if 0%{?suse_version} > 1230 %if 0%{?suse_version} > 1230
%define with_systemd 1 %define with_systemd 1
%else %else
@ -211,9 +211,9 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm
# prepare for defaul-dm to be chosen by means of update-alternatives # prepare for defaul-dm to be chosen by means of update-alternatives
mkdir -p %{buildroot}%{_sysconfdir}/alternatives mkdir -p %{buildroot}%{_sysconfdir}/alternatives
touch %{buildroot}%{_sysconfdir}/alternatives/default-displaymanager touch %{buildroot}%{_sysconfdir}/alternatives/default-displaymanager
ln -s %{_sysconfdir}/alternatives/default-displaymanager %{buildroot}%{_libexecdir}/X11/displaymanagers/default-displaymanager ln -s %{_sysconfdir}/alternatives/default-displaymanager %{buildroot}/usr/lib/X11/displaymanagers/default-displaymanager
# Inject a dummy 'console' selection - which used to be choice in /etc/sysconfig/displaymanager # Inject a dummy 'console' selection - which used to be choice in /etc/sysconfig/displaymanager
touch %{buildroot}%{_libexecdir}/X11/displaymanagers/console touch %{buildroot}/usr/lib/X11/displaymanagers/console
%endif %endif
%post %post
@ -224,10 +224,10 @@ touch %{buildroot}%{_libexecdir}/X11/displaymanagers/console
%{fillup_only -n displaymanager} %{fillup_only -n displaymanager}
%endif %endif
%if 0%{?suse_version} >= 1330 %if 0%{?suse_version} >= 1330
%{_sbindir}/update-alternatives --install %{_libexecdir}/X11/displaymanagers/default-displaymanager \ %{_sbindir}/update-alternatives --install /usr/lib/X11/displaymanagers/default-displaymanager \
default-displaymanager %{_libexecdir}/X11/displaymanagers/console 5 default-displaymanager /usr/lib/X11/displaymanagers/console 5
%{_sbindir}/update-alternatives --install %{_libexecdir}/X11/displaymanagers/default-displaymanager \ %{_sbindir}/update-alternatives --install /usr/lib/X11/displaymanagers/default-displaymanager \
default-displaymanager %{_libexecdir}/X11/displaymanagers/xdm 10 default-displaymanager /usr/lib/X11/displaymanagers/xdm 10
# get rid of DISPLAYMANAGER in /etc/sysconfig/displaymanager (boo#1125040) # get rid of DISPLAYMANAGER in /etc/sysconfig/displaymanager (boo#1125040)
sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager
%endif %endif
@ -248,10 +248,10 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager
%service_del_postun -n display-manager.service %service_del_postun -n display-manager.service
%endif %endif
%if 0%{?suse_version} >= 1330 %if 0%{?suse_version} >= 1330
[ -f %{_libexecdir}/X11/displaymanagers/console ] || %{_sbindir}/update-alternatives \ [ -f /usr/lib/X11/displaymanagers/console ] || %{_sbindir}/update-alternatives \
--remove default-displaymanager %{_libexecdir}/X11/displaymanagers/console --remove default-displaymanager /usr/lib/X11/displaymanagers/console
[ -f %{_libexecdir}/X11/displaymanagers/xdm ] || %{_sbindir}/update-alternatives \ [ -f /usr/lib/X11/displaymanagers/xdm ] || %{_sbindir}/update-alternatives \
--remove default-displaymanager %{_libexecdir}/X11/displaymanagers/xdm --remove default-displaymanager /usr/lib/X11/displaymanagers/xdm
%endif %endif
%preun %preun
@ -267,7 +267,7 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager
%{_dminitdir}/xdm %{_dminitdir}/xdm
%if 0%{?suse_version} >= 1330 %if 0%{?suse_version} >= 1330
%{_dminitdir}/console %{_dminitdir}/console
%{_libexecdir}/X11/displaymanagers/default-displaymanager /usr/lib/X11/displaymanagers/default-displaymanager
%ghost %{_sysconfdir}/alternatives/default-displaymanager %ghost %{_sysconfdir}/alternatives/default-displaymanager
%endif %endif
%if %dm_fallbacks %if %dm_fallbacks
@ -281,19 +281,19 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager
%config %{_sysconfdir}/X11/xdm/ %config %{_sysconfdir}/X11/xdm/
%dir %{_sysconfdir}/X11/xdm/scripts %dir %{_sysconfdir}/X11/xdm/scripts
%if 0%{?suse_version} > 1320 %if 0%{?suse_version} > 1320
%dir %{_libexecdir}/firewalld %dir /usr/lib/firewalld
%dir %{_libexecdir}/firewalld/services %dir /usr/lib/firewalld/services
%{_libexecdir}/firewalld/services/x11.xml /usr/lib/firewalld/services/x11.xml
%else %else
%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/xdmcp %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/xdmcp
%endif %endif
%if 0%{?suse_version} < 1315 %if 0%{?suse_version} < 1315
%{_sysconfdir}/init.d/xdm %{_sysconfdir}/init.d/xdm
%exclude %{_libexecdir}/X11/display-manager %exclude /usr/lib/X11/display-manager
%else %else
%exclude %{_sysconfdir}/init.d/xdm %exclude %{_sysconfdir}/init.d/xdm
%{_unitdir}/display-manager.service %{_unitdir}/display-manager.service
%{_libexecdir}/X11/display-manager /usr/lib/X11/display-manager
%endif %endif
%config %{_sysconfdir}/logrotate.d/xdm %config %{_sysconfdir}/logrotate.d/xdm
%config(noreplace) %{_sysconfdir}/pam.d/xdm %config(noreplace) %{_sysconfdir}/pam.d/xdm