From 352edbb7edd11b5dafc751c45a10c5a3c5634a42 Mon Sep 17 00:00:00 2001
From: Gilboa Davara <gilboa@fedoraproject.org>
Date: Apr 09 2007 09:51:08 +0000
Subject: *** empty log message ***


---

diff --git a/icewm-1.2.30-apm-battery.patch b/icewm-1.2.30-apm-battery.patch
new file mode 100644
index 0000000..88e7e31
--- /dev/null
+++ b/icewm-1.2.30-apm-battery.patch
@@ -0,0 +1,11 @@
+--- src/aapm.cc.orig	Sat Apr  7 21:01:04 2007
++++ src/aapm.cc	Sat Apr  7 21:02:57 2007
+@@ -632,7 +632,7 @@
+ 
+     //estimate applet's size
+     for (i = 0; i < batteryNum; i++) {
+-        if (acpiBatteries[i]->present == BAT_ABSENT)
++        if (mode == ACPI && acpiBatteries[i]->present == BAT_ABSENT)
+             continue;
+         if (taskBarShowApmTime)
+             strcat(buf, "0:00");
diff --git a/icewm.spec b/icewm.spec
index 11910f7..1fc7351 100644
--- a/icewm.spec
+++ b/icewm.spec
@@ -1,6 +1,6 @@
 Name:			icewm
 Version:		1.2.30
-Release:		12%{?dist}
+Release:		13%{?dist}
 Summary:		Light and configurable window manager
 
 Group:			User Interface/Desktops
@@ -28,6 +28,7 @@ Patch0:			icewm-configure.patch
 Patch1:			icewm-menu.patch
 Patch2:			icewm-toolbar.patch
 Patch3:			icewm-keys.patch
+Patch4:			icewm-1.2.30-apm-battery.patch
 
 
 %description
@@ -67,6 +68,7 @@ user logs-in.
 %patch1 -p1 -b .menu
 %patch2 -p1 -b .toolbar
 %patch3 -p1 -b .keys
+%patch4 -p0 -b .apmbattery
 
 
 %build
@@ -129,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr 09 2007 <gilboad AT gmail DOT com> - 1.2.30-13
+- APMStatus crash fix. (Icewm #1696182)
+
 * Sat Feb 10 2007 <gilboad AT gmail DOT com> - 1.2.30-12
 - Add missing dot in the -gnome sub-package description.
 - Replace REQ icewm (in both -gnome and -xdgmenu) with icewm-x.x.x.