From f189eb70ff8cd2b3ab5990efd75cb34b3b56e6fe796ba67773990b9681eb6518 Mon Sep 17 00:00:00 2001
From: Michal Marek <michal.lkml@markovi.net>
Date: Mon, 21 Mar 2011 10:59:59 +0000
Subject: [PATCH] Accepting request 64628 from
 home:michal-m:branches:X11:windowmanagers

OBS-URL: https://build.opensuse.org/request/show/64628
OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/icewm?expand=0&rev=14
---
 icewm-1.3.6.tar.bz2     |  3 ---
 icewm-1.3.7.tar.bz2     |  3 +++
 icewm-preferences.patch | 10 +++++-----
 icewm.changes           | 13 +++++++++++++
 icewm.spec              |  3 ++-
 5 files changed, 23 insertions(+), 9 deletions(-)
 delete mode 100644 icewm-1.3.6.tar.bz2
 create mode 100644 icewm-1.3.7.tar.bz2

diff --git a/icewm-1.3.6.tar.bz2 b/icewm-1.3.6.tar.bz2
deleted file mode 100644
index 72546e3..0000000
--- a/icewm-1.3.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d816ee9fd46dce519d2197df62a667c1cb513ab4e9f89bb55196d102d161305c
-size 657270
diff --git a/icewm-1.3.7.tar.bz2 b/icewm-1.3.7.tar.bz2
new file mode 100644
index 0000000..19d18ea
--- /dev/null
+++ b/icewm-1.3.7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:05f66a051001207ad0309c996fdc997a45d2fdd82212a012e06f2ca914753bab
+size 652187
diff --git a/icewm-preferences.patch b/icewm-preferences.patch
index 175cb2e..e5028ba 100644
--- a/icewm-preferences.patch
+++ b/icewm-preferences.patch
@@ -19,7 +19,7 @@ a file generated by ./src/genpref. To edit the patch:
 
 --- lib/preferences.orig
 +++ lib/preferences
-@@ -464,7 +464,7 @@
+@@ -509,7 +509,7 @@
  # NewMailCommand=""
  
  #  Command to lock display/screensaver
@@ -28,20 +28,20 @@ a file generated by ./src/genpref. To edit the patch:
  
  #  Command to run on clock
  # ClockCommand="xclock -name icewm -title Clock"
-@@ -488,10 +488,10 @@
+@@ -533,10 +533,10 @@
  # LogoutCancelCommand=""
  
  #  Command to shutdown the system
 -# ShutdownCommand=""
-+ShutdownCommand="dbus-send --system --dest=org.freedesktop.Hal --type=method_call --print-reply /org/freedesktop/Hal/devices/computer org.freedesktop.Hal.Device.SystemPowerManagement.Shutdown"
++ShutdownCommand="dbus-send --system --print-reply --dest=org.freedesktop.ConsoleKit /org/freedesktop/ConsoleKit/Manager org.freedesktop.ConsoleKit.Manager.Stop"
  
  #  Command to reboot the system
 -# RebootCommand=""
-+RebootCommand="dbus-send --system --dest=org.freedesktop.Hal --type=method_call --print-reply /org/freedesktop/Hal/devices/computer org.freedesktop.Hal.Device.SystemPowerManagement.Reboot"
++RebootCommand="dbus-send --system --print-reply --dest=org.freedesktop.ConsoleKit /org/freedesktop/ConsoleKit/Manager org.freedesktop.ConsoleKit.Manager.Restart"
  
  #  Command to run on CPU status
  # CPUStatusCommand="xterm -name top -title Process\ Status -e top"
-@@ -1223,19 +1223,19 @@ WorkspaceNames=" 1 ", " 2 ", " 3 ", " 4
+@@ -1280,19 +1280,19 @@ WorkspaceNames=" 1 ", " 2 ", " 3 ", " 4
  #
  
  #  Display desktop background centered and not tiled
diff --git a/icewm.changes b/icewm.changes
index e8f7e8c..0771a28 100644
--- a/icewm.changes
+++ b/icewm.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Mar 21 10:58:16 UTC 2011 - mmarek@novell.com
+
+- Fix shutdown and reboot (bnc#681126).
+
+-------------------------------------------------------------------
+Mon Mar 21 10:46:09 UTC 2011 - mmarek@novell.com
+
+- Update to 1.3.7:
+  * battery status as graphics not text (Alexander Drozdov)
+  * 'icewm-set-gnomewm' script to set GNOME window manager to icewm
+  * bugfixes
+
 -------------------------------------------------------------------
 Wed Sep  8 03:06:27 CEST 2010 - vuntz@opensuse.org
 
diff --git a/icewm.spec b/icewm.spec
index b563723..63d63e4 100644
--- a/icewm.spec
+++ b/icewm.spec
@@ -31,7 +31,7 @@ Group:          System/GUI/Other
 Provides:       windowmanager
 Requires:       icewm-bin, xdg-menu, desktop-data
 AutoReqProv:    on
-Version:        1.3.6
+Version:        1.3.7
 Release:        8
 Source:         icewm-%version.tar.bz2
 Source1:        %{name}.desktop
@@ -178,5 +178,6 @@ rm -rf $RPM_BUILD_ROOT;
 %defattr(-,root,root)
 /usr/bin/icesound
 /usr/bin/icewm-menu-gnome2
+/usr/bin/icewm-set-gnomewm
 
 %changelog