commit icewm for openSUSE:Factory
Hello community, here is the log from the commit of package icewm for openSUSE:Factory checked in at 2018-03-01 12:01:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icewm (Old) and /work/SRC/openSUSE:Factory/.icewm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "icewm" Thu Mar 1 12:01:14 2018 rev:56 rq:580526 version:1.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/icewm/icewm.changes 2018-01-19 11:47:11.640663661 +0100 +++ /work/SRC/openSUSE:Factory/.icewm.new/icewm.changes 2018-03-01 12:01:16.276170876 +0100 @@ -1,0 +2,8 @@ +Tue Feb 27 03:04:05 UTC 2018 - qzheng@suse.com + +- Add icewm-use-iproute2-ss-instead-of-netstat.patch: + Because netstat is not available by default, so call "ss" instead + of "netstat", and make the "clock" command work on icewm + ( bsc#1079627 ). + +------------------------------------------------------------------- New: ---- icewm-use-iproute2-ss-instead-of-netstat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icewm.spec ++++++ --- /var/tmp/diff_new_pack.p2p340/_old 2018-03-01 12:01:16.884149077 +0100 +++ /var/tmp/diff_new_pack.p2p340/_new 2018-03-01 12:01:16.888148934 +0100 @@ -31,6 +31,8 @@ Patch1: icewm-susemenu.patch # PATCH-FIX-OPENSUSE icewm-desktop-nodisplay.patch qkzhu@suse.com -- Set NoDisplay for icewm.desktop Patch2: icewm-desktop-nodisplay.patch +# PATCH-FIX-UPSTREAM icewm-use-iproute2-ss-instead-of-netstat.patch qzheng@suse.com -- Use ss instead of netstat +Patch3: icewm-use-iproute2-ss-instead-of-netstat.patch Patch99: icewm-preferences.patch BuildRequires: autoconf BuildRequires: automake @@ -66,6 +68,7 @@ Recommends: icewm-lang = %{version} # For locking you need xscreensaver Recommends: xscreensaver +Recommends: xclock %if !0%{?is_opensuse} Recommends: polkit-gnome %endif @@ -138,6 +141,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Do not require needlessly new gettext. sed -i 's/0.19.6/0.18.3/g' configure.ac ++++++ icewm-use-iproute2-ss-instead-of-netstat.patch ++++++ diff --git a/src/default.h b/src/default.h index a5e9a52..acc671a 100644 --- a/src/default.h +++ b/src/default.h @@ -200,8 +200,12 @@ XIV(int, taskBarNetDelay, 500) XSV(const char *, cpuCommand, "xterm -name top -title Process\\ Status -e top") XSV(const char *, cpuClassHint, "top.XTerm") XIV(bool, cpuCombine, true) -XSV(const char *, netCommand, "xterm -name netstat -title 'Network Status' -e netstat -c") XSV(const char *, netClassHint, "netstat.XTerm") +#ifdef __linux__ +XSV(const char *, netCommand, "xterm -name netstat -title 'Network Status' -e sh -c 'which ss > /dev/null && watch -t ss -putsw || netstat -c'") +#else +XSV(const char *, netCommand, "xterm -name netstat -title 'Network Status' -e netstat -c") +#endif XSV(const char *, netDevice, "eth0 wlan0") XSV(const char *, addressBarCommand, 0) #ifdef CONFIG_I18N
participants (1)
-
root@hilbert.suse.de