rpms/icewm/devel icewm-1.2.30-apm-battery.patch, NONE, 1.1 icewm.spec, 1.1, 1.2

[Gilboa Davara (gilboa)]

Author: gilboa

Update of /cvs/extras/rpms/icewm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23556

Modified Files:
	icewm.spec 
Added Files:
	icewm-1.2.30-apm-battery.patch 
Log Message:


icewm-1.2.30-apm-battery.patch:

--- NEW FILE icewm-1.2.30-apm-battery.patch ---
--- 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");


Index: icewm.spec
===================================================================
RCS file: /cvs/extras/rpms/icewm/devel/icewm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icewm.spec	15 Feb 2007 09:55:58 -0000	1.1
+++ icewm.spec	9 Apr 2007 09:51:08 -0000	1.2
@@ -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 @@
 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 @@
 %patch1 -p1 -b .menu
 %patch2 -p1 -b .toolbar
 %patch3 -p1 -b .keys
+%patch4 -p0 -b .apmbattery
 
 
 %build
@@ -129,6 +131,9 @@
 
 
 %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.