rpms/xfce4-battery-plugin/F-8 xfce4-battery-plugin-0.5.0-acpi.patch, NONE, 1.1 xfce4-battery-plugin-0.5.0-fix-ftbfs-2.6.24.patch, NONE, 1.1 xfce4-battery-plugin-0.5.0-lower-acpi-polling.patch, NONE, 1.1 xfce4-battery-plugin.spec, 1.13, 1.14

[Christoph Wickert (cwickert)]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-battery-plugin/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19812

Modified Files:
	xfce4-battery-plugin.spec 
Added Files:
	xfce4-battery-plugin-0.5.0-acpi.patch 
	xfce4-battery-plugin-0.5.0-fix-ftbfs-2.6.24.patch 
	xfce4-battery-plugin-0.5.0-lower-acpi-polling.patch 
Log Message:
* Sat Apr 05 2008 Christoph Wickert <fedora christoph-wickert de> - 0.5.0-4
- Fix for kernel 2.6.24  (bugzilla.xfce.org #3938)
- Lower acpi polling. (bugzilla.xfce.org #2948)
- Rebuild with gcc 4.3.0


xfce4-battery-plugin-0.5.0-acpi.patch:

--- NEW FILE xfce4-battery-plugin-0.5.0-acpi.patch ---
diff -urN xfce4-battery-plugin-0.5.0/panel-plugin/libacpi.c xfce4-battery-plugin-0.5.0-new/panel-plugin/libacpi.c
--- xfce4-battery-plugin-0.5.0/panel-plugin/libacpi.c	2007-01-17 18:56:51.000000000 +0100
+++ xfce4-battery-plugin-0.5.0-new/panel-plugin/libacpi.c	2007-07-25 12:03:41.000000000 +0200
@@ -190,10 +190,12 @@
 #ifdef __linux__
   FILE *acpi;
 
-  if (!(acpi = fopen ("/proc/acpi/info", "r")))
+  if (!(acpi = fopen ("/proc/acpi/info", "r")) &&
+  	!(acpi = fopen ("/sys/module/acpi/parameters/acpica_version", "r")))
   {
 #ifdef DEBUG
-	  printf("DBG:no acpi: /proc/acpi/info not found!\n");
+	  printf("DBG:no acpi: /proc/acpi/info or "
+	  		"/sys/module/acpi/parameters/acpica_version not found!\n");
 #endif
     return 1;
   }

xfce4-battery-plugin-0.5.0-fix-ftbfs-2.6.24.patch:

--- NEW FILE xfce4-battery-plugin-0.5.0-fix-ftbfs-2.6.24.patch ---
--- xfce4-battery-plugin-0.5.0/panel-plugin/libapm.h.orig	2008-03-18 20:10:58.000000000 +0100
+++ xfce4-battery-plugin-0.5.0/panel-plugin/libapm.h	2008-03-18 20:14:45.000000000 +0100
@@ -17,8 +17,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/apm_bios.h>
 #include <sys/types.h>
+#include <linux/apm_bios.h>
 
 #define APM_PROC   "/proc/apm"
 #define APM_DEVICE "/dev/apm_bios"

xfce4-battery-plugin-0.5.0-lower-acpi-polling.patch:

--- NEW FILE xfce4-battery-plugin-0.5.0-lower-acpi-polling.patch ---
Index: panel-plugin/battery.c
===================================================================
--- panel-plugin/battery.c	(revision 3481)
+++ panel-plugin/battery.c	(working copy)
@@ -326,14 +326,14 @@
         }
             else
 #endif
-            battmon->timeoutid = g_timeout_add(2 * 1024,
+            battmon->timeoutid = g_timeout_add(10 * 1024,
                     (GSourceFunc) update_apm_status, battmon);
     }
 
     /* Show initial state if using ACPI rather than waiting a minute */
     if(battmon->flag) {
         g_source_remove(battmon->timeoutid);
-        battmon->timeoutid = g_timeout_add(2 * 1024,
+        battmon->timeoutid = g_timeout_add(10 * 1024,
                 (GSourceFunc) update_apm_status, battmon);
     }
 
@@ -739,7 +739,7 @@
     gtk_container_remove(GTK_CONTAINER(battmon->ebox), GTK_WIDGET(battmon->vbox));
     setup_battmon(battmon,orientation);
     update_apm_status( battmon );
-    battmon->timeoutid = g_timeout_add(1 * 1024, (GSourceFunc) update_apm_status, battmon);
+    battmon->timeoutid = g_timeout_add(10 * 1024, (GSourceFunc) update_apm_status, battmon);
 
     return TRUE;
 }
@@ -1405,7 +1405,7 @@
     if(battmon->method == BM_USE_ACPI) {
         battmon->flag = TRUE;
         g_source_remove(battmon->timeoutid);
-        battmon->timeoutid = g_timeout_add(1000, (GSourceFunc) update_apm_status, battmon);
+        battmon->timeoutid = g_timeout_add(10 * 1024, (GSourceFunc) update_apm_status, battmon);
     }
 }
 


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-battery-plugin/F-8/xfce4-battery-plugin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xfce4-battery-plugin.spec	28 Aug 2007 21:56:45 -0000	1.13
+++ xfce4-battery-plugin.spec	5 Apr 2008 16:04:48 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		xfce4-battery-plugin
 Version:	0.5.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -8,6 +8,9 @@
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-0.5.0-acpi.patch
+Patch1:		%{name}-0.5.0-fix-ftbfs-2.6.24.patch
+Patch2:		%{name}-0.5.0-lower-acpi-polling.patch
+#Patch3:		%{name}-0.5.0-use-sysfs.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel
@@ -20,6 +23,9 @@
 %prep
 %setup -q
 %patch0 -p1 -b .acpi
+%patch1 -p1 -b .2.6.24
+%patch2 -p0 -b .lower-acpi-polling
+#%patch3 -p0 -b .use-sysfs
 
 %build
 %configure --disable-static
@@ -50,6 +56,11 @@
 %{_datadir}/icons/hicolor/scalable/devices/battery.svg
 
 %changelog
+* Sat Apr 05 2008 Christoph Wickert <fedora christoph-wickert de> - 0.5.0-4
+- Fix for kernel 2.6.24  (bugzilla.xfce.org #3938)
+- Lower acpi polling. (bugzilla.xfce.org #2948)
+- Rebuild with gcc 4.3.0
+
 * Tue Aug 28 2007 Christoph Wickert <fedora christoph-wickert de> - 0.5.0-3
 - Fix for x86_64 kernels >= 2.6.21. (bugzilla.xfce.org #3190)
 - Update license tag