From d90990b6569e196c454188ff515d87a6e6f11a3f Mon Sep 17 00:00:00 2001
From: Artem Polishchuk <ego.cordatus@gmail.com>
Date: Sep 21 2019 12:18:22 +0000
Subject: Replace 'pasystray' with 'volumeicon'


---

diff --git a/icewm-keys.patch b/icewm-keys.patch
index 098085c..906afa4 100644
--- a/icewm-keys.patch
+++ b/icewm-keys.patch
@@ -9,13 +9,13 @@
 +key "Super+t"				gnome-terminal
 +key "Super+r"				rofi -show drun
 +key "Super+s"				gnome-screenshot
-+# key "Super+s"				deepin-screenshot
-+key "Super+f"				xdg-open /home
++#key "Super+s"				deepin-screenshot
++key "Super+f"				nautilus
 +key "Super+e"				gedit
 +key "Super+h"				gnome-terminal -- htop
  key "Alt+Ctrl+b"			xdg-open about:blank
 -key "Alt+Ctrl+s"			xdg-open https://www.google.com
-+# key "Alt+Ctrl+s"			xdg-open https://www.google.com
++#key "Alt+Ctrl+s"			xdg-open https://www.google.com
 +key "Super+Shift+p"			poweroff
 +key "Super+Shift+r"			reboot
 +key "Super+Shift+s"			systemctl suspend
@@ -24,8 +24,8 @@
 +key "Super+KP_Subtract"		amixer sset Master 5%-
  key "Super+KP_Add"			amixer sset Master 5%+
  
-+key "Super+1"				amixer sset Master 5%-
-+key "Super+2"				amixer sset Master 5%+
++key "Super+q"				amixer sset Master 5%-
++key "Super+w"				amixer sset Master 5%+
 +
  # "Multimedia key" bindings for Xorg. Gather the keycodes of your
  # advanced function keys by watching the output of the xev command whilest
diff --git a/icewm-startup b/icewm-startup
index 98437bd..436f09f 100755
--- a/icewm-startup
+++ b/icewm-startup
@@ -10,10 +10,12 @@ sleep 1 &&
 #compton --backend glx --glx-no-stencil --blur-background --blur-kern 7x7box -cC -r 20 -l -20 -t -20 -o 0.8 &
 
 nm-applet &
-pasystray &
 redshift-gtk &
+volumeicon &
 
 #evolution &
 #gwe &
+#pasystray &
 #telegram-desktop &
 #workrave &
+
diff --git a/icewm.spec b/icewm.spec
index 404c8b4..2d2c920 100644
--- a/icewm.spec
+++ b/icewm.spec
@@ -6,7 +6,7 @@
 
 Name:           icewm
 Version:        1.6.1
-Release:        10%{?dist}
+Release:        12%{?dist}
 Summary:        Window manager designed for speed, usability, and consistency
 
 License:        LGPLv2+
@@ -86,16 +86,18 @@ Recommends:     gnome-terminal%{?_isa}
 Recommends:     lxrandr%{?_isa}
 
 Recommends:     network-manager-applet%{?_isa}
-# Volume control
-Recommends:     pasystray%{?_isa}
-Recommends:     pavucontrol%{?_isa}
 # Night mode
 Recommends:     redshift-gtk%{?_isa}
 # Launcher
 Recommends:     rofi%{?_isa}
+# Volume control
+Recommends:     volumeicon%{?_isa}
 Suggests:       %{name}-minimal-session = %{version}-%{release}
 # --- Various additional useful tools ---
 Suggests:       deepin-screenshot%{?_isa}
+# Volume control
+Suggests:       pasystray%{?_isa}
+Suggests:       pavucontrol%{?_isa}
 # Graphical app launcher for X with minimal dependencies
 Suggests:       xlunch%{?_isa}
 # https://github.com/bbidulock/icewm/issues/379
@@ -182,6 +184,7 @@ sed -i 's!carlito:size=13!Cantarell:size=11!' Araita*/*.theme
 sed -i 's!#DesktopBackgroundImage=                   "/usr/share/wallpapers/default.jpg"!DesktopBackgroundImage=                   "%{_datadir}/backgrounds/%{name}-wallpaper.png"!' Araita*/*.theme
 mkdir -p %{_target_platform}
 
+
 %build
 %if 0%{?fedora} || 0%{?rhel} >= 8
 # Enable LTO
@@ -203,6 +206,7 @@ pushd %{_target_platform}
     ..
 %make_build
 
+
 %install
 pushd %{_target_platform}
 %make_install
@@ -224,6 +228,7 @@ install -Dpm0755 %{SOURCE30}    %{buildroot}%{_datadir}/%{name}/startup
 install -Dpm0644 %{SOURCE40}    %{buildroot}%{_datadir}/backgrounds/%{name}-wallpaper.png
 %find_lang %{name}
 
+
 %files -f %{name}.lang
 %license COPYING
 %doc README.md AUTHORS
@@ -289,7 +294,11 @@ install -Dpm0644 %{SOURCE40}    %{buildroot}%{_datadir}/backgrounds/%{name}-wall
 %{_sysconfdir}/gtk-2.0/gtkrc
 %{_sysconfdir}/gtk-3.0/settings.ini
 
+
 %changelog
+* Sun Sep 15 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 1.6.1-12
+- Replace 'pasystray' with 'volumeicon'
+
 * Thu Sep 12 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 1.6.1-10
 - Minor theming fixes