Hello community,

here is the log from the commit of package icewm for openSUSE:Factory checked 
in at 2017-12-29 18:47:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/icewm (Old)
 and      /work/SRC/openSUSE:Factory/.icewm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "icewm"

Fri Dec 29 18:47:36 2017 rev:54 rq:559070 version:1.4.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/icewm/icewm.changes      2017-12-19 
10:47:15.661867259 +0100
+++ /work/SRC/openSUSE:Factory/.icewm.new/icewm.changes 2017-12-29 
18:47:43.455786758 +0100
@@ -1,0 +2,11 @@
+Thu Dec 21 03:22:18 UTC 2017 - [email protected]
+
+- Drop our distribution's icewm.desktop and use the one provided by
+  IceWM upstream
+- Add patch icewm-desktop-nodisplay.patch
+  Set NoDisplay for upstream's icewm.desktop since it only starts the
+  window manager, icewm-session.desktop (the preferred program to 
+  start the IceWM system) will be displayed in display manager 
+  (bsc#1072557)
+
+-------------------------------------------------------------------

Old:
----
  icewm.desktop

New:
----
  icewm-desktop-nodisplay.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ icewm.spec ++++++
--- /var/tmp/diff_new_pack.jx9u2U/_old  2017-12-29 18:47:44.283549022 +0100
+++ /var/tmp/diff_new_pack.jx9u2U/_new  2017-12-29 18:47:44.287547873 +0100
@@ -25,11 +25,12 @@
 Group:          System/GUI/Other
 Url:            http://www.icewm.org/
 Source0:        
https://github.com/bbidulock/%{name}/releases/download/%{version}/%{name}-%{version}.tar.bz2
-Source1:        icewm.desktop
 # PATCH-FIX-OPENSUSE icewm-mate.patch [email protected] -- Add MATE Menus 
support.
 Patch0:         icewm-mate.patch
 # PATCH-FEATURE-SUSE icewm-susemenu.patch [email protected] -- Add xdg-menu for 
SLED icewm
 Patch1:         icewm-susemenu.patch
+# PATCH-FIX-OPENSUSE icewm-desktop-nodisplay.patch [email protected] -- Set 
NoDisplay for icewm.desktop
+Patch2:         icewm-desktop-nodisplay.patch
 Patch99:        icewm-preferences.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -136,6 +137,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 # Do not require needlessly new gettext.
 sed -i 's/0.19.6/0.18.3/g' configure.ac
 
@@ -207,9 +209,6 @@
 %find_lang icewm
 ln -sf icewm.html %{buildroot}/%{_docdir}/icewm/index.html
 
-# Install the xsession desktop file.
-install -Dm 0644 %{SOURCE1} %{buildroot}%{_datadir}/xsessions/icewm.desktop
-
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives/
 for file in %{lites}; do
     mv -f lite/$file-lite %{buildroot}%{_prefix}/bin
@@ -220,7 +219,7 @@
     ln -s %{_sysconfdir}/alternatives/$file %{buildroot}%{_bindir}/$file
 done
 
-%suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/icewm.desktop
+%suse_update_desktop_file 
%{buildroot}%{_datadir}/xsessions/icewm-session.desktop
 
 touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop
 ln -s %{_sysconfdir}/alternatives/default-xsession.desktop 
%{buildroot}%{_datadir}/xsessions/default.desktop
@@ -230,11 +229,11 @@
 
 %post
 %{_sbindir}/update-alternatives --install 
%{_datadir}/xsessions/default.desktop \
-  default-xsession.desktop %{_datadir}/xsessions/icewm.desktop 15
+  default-xsession.desktop %{_datadir}/xsessions/icewm-session.desktop 15
 
 %postun
-[ -f %{_datadir}/xsessions/icewm.desktop ] || %{_sbindir}/update-alternatives \
-  --remove default-xsession.desktop %{_datadir}/xsessions/icewm.desktop
+[ -f %{_datadir}/xsessions/icewm-session.desktop ] || 
%{_sbindir}/update-alternatives \
+  --remove default-xsession.desktop %{_datadir}/xsessions/icewm-session.desktop
 
 %post lite
 %{_sbindir}/update-alternatives \

++++++ icewm-desktop-nodisplay.patch ++++++
>From 3d09111fa081005c772c2942d42cc2d1600047f5 Mon Sep 17 00:00:00 2001
From: Chingkai <[email protected]>
Date: Wed, 20 Dec 2017 15:13:07 +0800
Subject: [PATCH] Set NoDisplay for icewm.desktop

---
 lib/icewm.desktop | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: icewm-1.4.2/lib/icewm.desktop
===================================================================
--- icewm-1.4.2.orig/lib/icewm.desktop
+++ icewm-1.4.2/lib/icewm.desktop
@@ -11,7 +11,7 @@ Comment[da]=Simpel og hurtig vindueshån
 Icon=icewm
 TryExec=/usr/bin/icewm
 Exec=icewm
-NoDisplay=false
+NoDisplay=true
 Hidden=false
 Categories=WindowManager;Application;System;
 StartupNotify=false

Reply via email to