From 0591da2a10f213b70c8900c51b230decc2c989270ada1f4c5baa8936c7e8a484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Mon, 26 Oct 2015 10:51:50 +0000
Subject: [PATCH] - Split out configuration files to allow icewm-theme-branding
 to   work

- Simplify reboot/shutdown commands:
  * icewm-preferences.patch

OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/icewm?expand=0&rev=49
---
 icewm-preferences.patch |  4 ++--
 icewm.changes           | 12 ++++++++++++
 icewm.spec              | 23 +++++++++++++++++++++--
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/icewm-preferences.patch b/icewm-preferences.patch
index 5765e09..01f8074 100644
--- a/icewm-preferences.patch
+++ b/icewm-preferences.patch
@@ -44,11 +44,11 @@ Index: src/preferences
  
  #  Command to shutdown the system
 -# ShutdownCommand="/bin/sh -c "{ test -e /run/systemd/system && systemctl poweroff; } ||:""
-+ShutdownCommand="/bin/sh -c "{ test -e /run/systemd/system && systemctl poweroff; } ||:""
++ShutdownCommand="/bin/sh -c "systemctl poweroff ||:""
  
  #  Command to reboot the system
 -# RebootCommand="/bin/sh -c "{ test -e /run/systemd/system && systemctl reboot; } ||:""
-+RebootCommand="/bin/sh -c "{ test -e /run/systemd/system && systemctl reboot; } ||:""
++RebootCommand="/bin/sh -c "systemctl reboot; ||:""
  
  #  Command to run on CPU status
  # CPUStatusCommand="xterm -name top -title Process\ Status -e top"
diff --git a/icewm.changes b/icewm.changes
index 247f051..f55ffb6 100644
--- a/icewm.changes
+++ b/icewm.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Oct 26 10:51:29 UTC 2015 - tchvatal@suse.com
+
+- Split out configuration files to allow icewm-theme-branding to
+  work
+
+-------------------------------------------------------------------
+Mon Oct 26 10:40:08 UTC 2015 - tchvatal@suse.com
+
+- Simplify reboot/shutdown commands:
+  * icewm-preferences.patch
+
 -------------------------------------------------------------------
 Mon Oct 26 10:31:51 UTC 2015 - tchvatal@suse.com
 
diff --git a/icewm.spec b/icewm.spec
index 91a97e5..2c74d50 100644
--- a/icewm.spec
+++ b/icewm.spec
@@ -58,6 +58,7 @@ BuildRequires:  pkgconfig(xrandr)
 Requires:       alsa-utils
 Requires:       desktop-data
 Requires:       icewm-bin
+Requires:       icewm-configuration-files
 Requires:       xdg-menu
 Requires:       xterm
 # If you have the choice, prefer the big one.
@@ -74,6 +75,21 @@ take the best features from those systems. IceWM features multiple
 workspaces, opaque move and resize, a taskbar, a window list,
 mailbox status, and a digital clock. It is fast and small.
 
+%package config-upstream
+Summary:        Window Manager with a Taskbar -- Default configuration
+Group:          System/GUI/Other
+Provides:       icewm-configuration-files = %{version}
+BuildArch:      noarch
+
+%description config-upstream
+A window manager for the X Window System that can emulate the look
+of Windows '95, OS/2 Warp 3, OS/2 Warp 4, and Motif and tries to
+take the best features from those systems. IceWM features multiple
+workspaces, opaque move and resize, a taskbar, a window list,
+mailbox status, and a digital clock. It is fast and small.
+
+Configuration files from upstream provider without suse branding
+
 %package default
 Summary:        Window Manager with a Taskbar -- Default Version
 Group:          System/GUI/Other
@@ -217,12 +233,15 @@ fi
 %files
 %defattr(-,root,root)
 %doc %{_docdir}/icewm
-%dir %{_sysconfdir}/icewm/
-%config %{_sysconfdir}/icewm/*
 %{_datadir}/icewm/
 %{_datadir}/xsessions/*
 %{_mandir}/man1/icewm.1%{?ext_man}
 
+%files config-upstream
+%defattr(-,root,root)
+%dir %{_sysconfdir}/icewm/
+%config %{_sysconfdir}/icewm/*
+
 %files lang -f icewm.lang
 %defattr(-,root,root)