SHA256
1
0
forked from pool/xdm

Accepting request 365553 from X11:XOrg

- After boo#968405 got fixed in /etc/rpm/macros.systemd, resurrect the old 
  behavior of %postun (boo#968405).

- xdm.tar.bz:
  * /etc/X11/xdm/sys.xsession: 
    fix regression from fix for boo#967002 (boo#968172).
  * /etc/X11/xdm/Xsession:
    + Add comments for documentation
    + Fix semantics
    + Don't use $HOME/.xinitrc as session script. Let sys.xession
      handle this.
    + Make argument parser more robust:
      add parse error detection.
  * Add an 'xsession' desktop file: this should offer a session 
    where the $HOME/.xsession is used (boo#968631).
  

- Remove %service_del_postun display-manager.service
  from %postun macro (boo#968405).

OBS-URL: https://build.opensuse.org/request/show/365553
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xdm?expand=0&rev=51
This commit is contained in:
Dominique Leuenberger 2016-03-07 14:02:29 +00:00 committed by Git OBS Bridge
commit 1c2a7cba05
3 changed files with 33 additions and 4 deletions

View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Thu Mar 3 15:31:51 UTC 2016 - eich@suse.com
- After boo#968405 got fixed in /etc/rpm/macros.systemd, resurrect the old
behavior of %postun (boo#968405).
-------------------------------------------------------------------
Sat Feb 27 11:53:42 UTC 2016 - eich@suse.com
- xdm.tar.bz:
* /etc/X11/xdm/sys.xsession:
fix regression from fix for boo#967002 (boo#968172).
* /etc/X11/xdm/Xsession:
+ Add comments for documentation
+ Fix semantics
+ Don't use $HOME/.xinitrc as session script. Let sys.xession
handle this.
+ Make argument parser more robust:
add parse error detection.
* Add an 'xsession' desktop file: this should offer a session
where the $HOME/.xsession is used (boo#968631).
-------------------------------------------------------------------
Fri Feb 26 12:46:53 UTC 2016 - eich@suse.com
- Remove %service_del_postun display-manager.service
from %postun macro (boo#968405).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 17 11:16:30 UTC 2016 - werner@suse.de Wed Feb 17 11:16:30 UTC 2016 - werner@suse.de

View File

@ -180,8 +180,7 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm
%{insserv_cleanup} %{insserv_cleanup}
%else %else
# Do not restart DM on update (bnc#886641) # Do not restart DM on update (bnc#886641)
export DISABLE_RESTART_ON_UPDATE=yes %service_del_postun -n display-manager.service
%service_del_postun display-manager.service
%endif %endif
%preun %preun
@ -229,6 +228,8 @@ export DISABLE_RESTART_ON_UPDATE=yes
%{_libdir}/X11/xdm/ %{_libdir}/X11/xdm/
%dir %{_datadir}/X11/app-defaults %dir %{_datadir}/X11/app-defaults
%{_datadir}/X11/app-defaults/Chooser %{_datadir}/X11/app-defaults/Chooser
%dir %{_datadir}/xsessions
%{_datadir}/xsessions/xsession.desktop
%{_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} < 1315 %if 0%{?suse_version} < 1315

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:84058c07eba515d89b0b481bf5ab8e41d0322aa7ba89d2ea853596617e95de73 oid sha256:72b5fe908da6ed78b238d158f344dca8f00e8cdaea8590317bfedb8c23ecfc2b
size 22344 size 22699