Hello community,
here is the log from the commit of package lxde-common for openSUSE:Factory
checked in at 2017-06-20 09:40:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lxde-common (Old)
and /work/SRC/openSUSE:Factory/.lxde-common.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxde-common"
Tue Jun 20 09:40:58 2017 rev:40 rq:504765 version:0.99.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/lxde-common/lxde-common.changes 2017-01-12
15:57:13.607707918 +0100
+++ /work/SRC/openSUSE:Factory/.lxde-common.new/lxde-common.changes
2017-06-20 09:40:58.711134787 +0200
@@ -1,0 +2,5 @@
+Mon Jun 19 14:08:26 UTC 2017 - fv...@suse.com
+
+- Use update-alternatives to create default.desktop xsession (boo#1030873)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lxde-common.spec ++++++
--- /var/tmp/diff_new_pack.wbchRC/_old 2017-06-20 09:40:59.423034413 +0200
+++ /var/tmp/diff_new_pack.wbchRC/_new 2017-06-20 09:40:59.427033850 +0200
@@ -1,7 +1,7 @@
#
# spec file for package lxde-common
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -34,6 +34,8 @@
Requires: lxde-common-branding
Provides: lxde-settings-daemon >= %{version}
Obsoletes: lxde-settings-daemon < %{version}
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Recommends: gtk2-engines
@@ -74,13 +76,22 @@
tar xjf %{SOURCE1}
mv %{buildroot}/%{_datadir}/lxde/wallpapers/lxde-new-wallpapers/*
%{buildroot}/%{_datadir}/lxde/wallpapers/
rm -rf %{buildroot}/%{_datadir}/lxde/wallpapers/lxde-new-wallpapers
+
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop
+ln -s %{_sysconfdir}/alternatives/default-xsession.desktop
%{buildroot}%{_datadir}/xsessions/default.desktop
+
%fdupes -s %{buildroot}
%post
%desktop_database_post
+%{_sbindir}/update-alternatives --install
%{_datadir}/xsessions/default.desktop \
+ default-xsession.desktop %{_datadir}/xsessions/lxde.desktop 20
%postun
%desktop_database_postun
+[ -f %{_datadir}/xsessions/lxde.desktop ] || %{_sbindir}/update-alternatives \
+ --remove default-xsession.desktop %{_datadir}/xsessions/lxde.desktop
%files
%defattr(-,root,root)
@@ -90,7 +101,8 @@
%dir %{_datadir}/lxde/wallpapers
%{_datadir}/lxde/wallpapers/*
%{_mandir}/man1/*
-%{_datadir}/xsessions/lxde.desktop
+%ghost %{_sysconfdir}/alternatives/default-xsession.desktop
+%{_datadir}/xsessions/*.desktop
%{_datadir}/applications/lxde-logout.desktop
%{_datadir}/applications/lxde-screenlock.desktop
