rpms/ohm/OLPC-2 ohm-0.1.1-disable-idle-module.patch, NONE, 1.1 ohm.spec, 1.4, 1.5

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/extras/rpms/ohm/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3975

Modified Files:
	ohm.spec 
Added Files:
	ohm-0.1.1-disable-idle-module.patch 
Log Message:
* Sun Jul 15 2007 Dan Williams <dcbw at redhat.com> - 0.1.1-5.1.20070713git.olpc2
- Disable 'idle' extension for now



ohm-0.1.1-disable-idle-module.patch:

--- NEW FILE ohm-0.1.1-disable-idle-module.patch ---
--- ohm-0.1.1/etc/modules.ini.disable-idle	2007-07-15 22:03:49.000000000 -0400
+++ ohm-0.1.1/etc/modules.ini	2007-07-15 22:04:03.000000000 -0400
@@ -14,13 +14,13 @@ PerformExtraChecks=true
 # This should list all the modules that are banned, i.e. will not be loaded.
 # If a loaded module requires a banned module, then startup will fail.
 # Typically this should be empty, unless you know what you are doing.
-ModulesBanned=embedded
+ModulesBanned=embedded;idle
 
 # This file should list all the modules that are suggested for coldplug.
 # If a suggested module is not present, then startup will not fail.
 # Typically this should contain modules most likely to be used on the system
 # OHM is targeted for. Order is unimportant, separate entries with ';'.
-ModulesSuggested=acadapter;backlight;battery;timeremaining;idle;powerstatus;dpms;buttons;xorg
+ModulesSuggested=acadapter;backlight;battery;timeremaining;powerstatus;dpms;buttons;xorg
 
 # This should list all the modules that are required for coldplug.
 # If a required module cannot be loaded, then startup will fail.


Index: ohm.spec
===================================================================
RCS file: /cvs/extras/rpms/ohm/OLPC-2/ohm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ohm.spec	13 Jul 2007 19:18:36 -0000	1.4
+++ ohm.spec	16 Jul 2007 02:08:44 -0000	1.5
@@ -7,9 +7,11 @@
 Summary: Open Hardware Manager
 Name: ohm
 Version: 0.1.1
-Release: 4.%alphatag
+Release: 5.1.%{alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/ohm
 Source0: http://people.freedesktop.org/~hughsient/temp/%{name}-%{version}-1.%alphatag.tar.gz
+Patch0: ohm-0.1.1-disable-idle-module.patch
+
 License: LGPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +52,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .disable-idle
 
 %build
 
@@ -119,6 +122,9 @@
 %{_includedir}/*
 
 %changelog
+* Sun Jul 15 2007 Dan Williams <dcbw at redhat.com> - 0.1.1-5.1.20070713git.olpc2
+- Disable 'idle' extension for now
+
 * Fri Jul 13 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.1.1-4.20070713git
 - Only connect idle time when X is up