Egbert Eich 2016-02-17 09:08:17 +00:00 committed by Git OBS Bridge
parent b7d02a10f1
commit 5d3b4e548d
2 changed files with 12 additions and 12 deletions

View File

@ -1,7 +1,7 @@
# #
# spec file for package xdm # spec file for package xdm
# #
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -146,14 +146,14 @@ rm %{buildroot}%{_libdir}/X11/xdm/libXdmGreet.la
mv %{buildroot}%{_libdir}/X11/xdm/chooser %{buildroot}%{_bindir} mv %{buildroot}%{_libdir}/X11/xdm/chooser %{buildroot}%{_bindir}
# fdo#35868 (closed INVALID, but because of above fix, we want it) # fdo#35868 (closed INVALID, but because of above fix, we want it)
ln -s xdm.1%{?ext_man} %{buildroot}%{_mandir}/man1/chooser.1%{?ext_man} ln -s xdm.1%{?ext_man} %{buildroot}%{_mandir}/man1/chooser.1%{?ext_man}
%if 0%{?suse_version} < 1320 %if 0%{?suse_version} < 1315
# missing manual page # missing manual page
mkdir -p %{buildroot}%{_mandir}/man8 mkdir -p %{buildroot}%{_mandir}/man8
ln -s ../man7/init.d.7%{?ext_man} %{buildroot}%{_mandir}/man8/rcxdm.8%{?ext_man} ln -s ../man7/init.d.7%{?ext_man} %{buildroot}%{_mandir}/man8/rcxdm.8%{?ext_man}
ln -sf %{_sysconfdir}/init.d/xdm %{buildroot}%{_sbindir}/rcxdm ln -sf %{_sysconfdir}/init.d/xdm %{buildroot}%{_sbindir}/rcxdm
%else %else
rm -f %{buildroot}%{_sbindir}/rcxdm rm -f %{buildroot}%{_sbindir}/rcxdm
install -D %{S:4} -m 0644 %{buildroot}%{_unitdir}/display-manager.service %__install -D %{S:4} -m 0444 %{buildroot}%{_unitdir}/display-manager.service
ln -sf service %{buildroot}%{_sbindir}/rcdisplay-manager ln -sf service %{buildroot}%{_sbindir}/rcdisplay-manager
cat > %{buildroot}%{_sbindir}/rcxdm <<-'EOF' cat > %{buildroot}%{_sbindir}/rcxdm <<-'EOF'
#!/bin/bash #!/bin/bash
@ -163,7 +163,7 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm
%endif %endif
%post %post
%if 0%{?suse_version} < 1320 %if 0%{?suse_version} < 1315
%{fillup_and_insserv -Y xdm} %{fillup_and_insserv -Y xdm}
%else %else
%service_add_post display-manager.service %service_add_post display-manager.service
@ -171,12 +171,12 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm
%{fillup_only -n displaymanager} %{fillup_only -n displaymanager}
%pre %pre
%if !0%{?suse_version} < 1320 %if !0%{?suse_version} < 1315
%service_add_pre display-manager.service %service_add_pre display-manager.service
%endif %endif
%postun %postun
%if 0%{?suse_version} < 1320 %if 0%{?suse_version} < 1315
%{insserv_cleanup} %{insserv_cleanup}
%else %else
# Do not restart DM on update (bnc#886641) # Do not restart DM on update (bnc#886641)
@ -185,7 +185,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
%endif %endif
%preun %preun
%if !0%{?suse_version} < 1320 %if !0%{?suse_version} < 1315
%service_del_preun display-manager.service %service_del_preun display-manager.service
%endif %endif
@ -205,7 +205,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
%endif %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
%if 0%{?suse_version} < 1320 %if 0%{?suse_version} < 1315
%{_sysconfdir}/init.d/xdm %{_sysconfdir}/init.d/xdm
%exclude %{_libexecdir}/X11/display-manager %exclude %{_libexecdir}/X11/display-manager
%else %else
@ -223,7 +223,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
%{_bindir}/chooser %{_bindir}/chooser
%{_bindir}/xdm %{_bindir}/xdm
%{_sbindir}/rcxdm %{_sbindir}/rcxdm
%if 0%{?suse_version} >= 1320 %if 0%{?suse_version} >= 1315
%{_sbindir}/rcdisplay-manager %{_sbindir}/rcdisplay-manager
%endif %endif
%{_libdir}/X11/xdm/ %{_libdir}/X11/xdm/
@ -231,7 +231,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
%{_datadir}/X11/app-defaults/Chooser %{_datadir}/X11/app-defaults/Chooser
%{_mandir}/man1/chooser.1%{?ext_man} %{_mandir}/man1/chooser.1%{?ext_man}
%{_mandir}/man1/xdm.1%{?ext_man} %{_mandir}/man1/xdm.1%{?ext_man}
%if 0%{?suse_version} < 1320 %if 0%{?suse_version} < 1315
%{_mandir}/man8/rcxdm.8%{?ext_man} %{_mandir}/man8/rcxdm.8%{?ext_man}
%endif %endif
%ifnarch %ix86 %ifnarch %ix86

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:0ad53cb2a98a61e590109b7373fcced4dc83703c307649a1059f2a90c40546d1 oid sha256:a761daea4b250256161672ad2639e83e4bab16ba4fa51b848f0a36ab3ee0f497
size 22175 size 22329