diff --git a/display-manager.service b/display-manager.service index cc6db40..10d6729 100644 --- a/display-manager.service +++ b/display-manager.service @@ -15,4 +15,4 @@ KillMode=process [Install] WantedBy=graphical.target -Also=xdm.service +Alias=xdm.service diff --git a/xdm.changes b/xdm.changes index 6a45dcd..0d16c97 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Aug 5 14:48:30 UTC 2014 - sndirsch@suse.com + +- replaced 'Also=' by 'Alias=' in display-manager.service + (bnc#890413) +- make sure not to restart DM on package update; remove confusing + comment about no longer existing %%stop_on_removal, + %restart_on_update macros from specfile (bnc#886641) + ------------------------------------------------------------------- Tue Jul 15 14:32:21 UTC 2014 - sndirsch@suse.com diff --git a/xdm.spec b/xdm.spec index 3e894e7..dab3b91 100644 --- a/xdm.spec +++ b/xdm.spec @@ -153,11 +153,6 @@ cat > %{buildroot}%{_sbindir}/rcxdm <<-'EOF' chmod 0755 %{buildroot}%{_sbindir}/rcxdm %endif -# Note: -# no %%stop_on_removal in %%preun -# no %%restart_on_update in %%postun -# => we don't want to end an existing session - %post %if 0%{?suse_version} < 1320 %{fillup_and_insserv -Y xdm} @@ -175,6 +170,8 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm %if 0%{?suse_version} < 1320 %{insserv_cleanup} %else +# Do not restart DM on update (bnc#886641) +export DISABLE_RESTART_ON_UPDATE=yes %service_del_postun display-manager.service %endif