rpms/ohm/OLPC-2 ohm-0.1.1-disable-xrandr.patch, NONE, 1.1 ohm-0.1.1-disable-idle-module.patch, 1.1, 1.2 ohm.spec, 1.7, 1.8

[Marco Pesenti Gritti (mpg)]

Author: mpg

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

Modified Files:
	ohm-0.1.1-disable-idle-module.patch ohm.spec 
Added Files:
	ohm-0.1.1-disable-xrandr.patch 
Log Message:
* Mon Jul 23 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.1.1-5.4.20070718git.olpc
- Disable xrandr



ohm-0.1.1-disable-xrandr.patch:

--- NEW FILE ohm-0.1.1-disable-xrandr.patch ---
--- ./plugins/policy/display/ohm-plugin-display.c.old	2007-07-23 22:43:51.000000000 +0200
+++ ./plugins/policy/display/ohm-plugin-display.c	2007-07-23 22:44:20.000000000 +0200
@@ -198,11 +198,11 @@
 		lid_closed (plugin, (value == 1));
 		break;
 	case CONF_TABLET_STATE_CHANGED:
-		if (value == 0) {
+/*		if (value == 0) {
 			ohm_plugin_conf_set_key (plugin, "xrandr.position", 0);
 		} else {
 			ohm_plugin_conf_set_key (plugin, "xrandr.position", 1);
-		}
+		}*/
 		break;
 	case CONF_AC_STATE_CHANGED:
 	case CONF_BACKLIGHT_STATE_CHANGED:

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

Index: ohm-0.1.1-disable-idle-module.patch
===================================================================
RCS file: /cvs/extras/rpms/ohm/OLPC-2/ohm-0.1.1-disable-idle-module.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ohm-0.1.1-disable-idle-module.patch	16 Jul 2007 02:08:44 -0000	1.1
+++ ohm-0.1.1-disable-idle-module.patch	23 Jul 2007 21:01:54 -0000	1.2
@@ -5,7 +5,7 @@
  # 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
++ModulesBanned=embedded;idle;xrandr
  
  # This file should list all the modules that are suggested for coldplug.
  # If a suggested module is not present, then startup will not fail.


Index: ohm.spec
===================================================================
RCS file: /cvs/extras/rpms/ohm/OLPC-2/ohm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ohm.spec	18 Jul 2007 18:32:54 -0000	1.7
+++ ohm.spec	23 Jul 2007 21:01:54 -0000	1.8
@@ -7,12 +7,14 @@
 Summary: Open Hardware Manager
 Name: ohm
 Version: 0.1.1
-Release: 5.3.%{alphatag}%{?dist}
+Release: 5.4.%{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
 # Hack; fix HAL suspend scripts instead of doing this
 Patch1: ohm-suspend-with-sysfs.patch
+# Hack: figure out the proper way to disable this
+Patch2: ohm-0.1.1-disable-xrandr.patch
 
 License: LGPL
 Group: System Environment/Libraries
@@ -56,6 +58,7 @@
 %setup -q
 %patch0 -p1 -b .disable-idle
 %patch1 -p1 -b .suspend-with-sysfs
+%patch2 -p1 -b .disable-xrandr
 
 %build
 
@@ -125,6 +128,9 @@
 %{_includedir}/*
 
 %changelog
+* Mon Jul 23 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.1.1-5.4.20070718git.olpc
+- Disable xrandr
+
 * Wed Jul 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 0.1.1-5.3.20070718git.olpc
 - New snapshot