diff --git a/icewm-use-iproute2-ss-instead-of-netstat.patch b/icewm-use-iproute2-ss-instead-of-netstat.patch new file mode 100644 index 0000000..7cc79d6 --- /dev/null +++ b/icewm-use-iproute2-ss-instead-of-netstat.patch @@ -0,0 +1,18 @@ +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 diff --git a/icewm.changes b/icewm.changes index ecb1972..274ec51 100644 --- a/icewm.changes +++ b/icewm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 ). + ------------------------------------------------------------------- Wed Jan 17 05:59:02 UTC 2018 - qzheng@suse.com diff --git a/icewm.spec b/icewm.spec index 5a14646..77bffa9 100644 --- a/icewm.spec +++ b/icewm.spec @@ -31,6 +31,8 @@ Patch0: icewm-mate.patch 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-default 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 @@ mailbox status, and a digital clock. It is fast and small. %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