rpms/ohm/F-12 ohm-0.1.1.buildfix.patch,NONE,1.1 ohm.spec,1.5,1.6

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/ohm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22985/F-12

Modified Files:
	ohm.spec 
Added Files:
	ohm-0.1.1.buildfix.patch 
Log Message:
Resolves: rhbz#539200 FTBFS

ohm-0.1.1.buildfix.patch:
 ohm-plugin-dpms.c |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE ohm-0.1.1.buildfix.patch ---
diff -ru ohm-0.1.1.orig/plugins/glue/dpms/ohm-plugin-dpms.c ohm-0.1.1/plugins/glue/dpms/ohm-plugin-dpms.c
--- ohm-0.1.1.orig/plugins/glue/dpms/ohm-plugin-dpms.c	2010-01-15 15:50:21.000000000 +0000
+++ ohm-0.1.1/plugins/glue/dpms/ohm-plugin-dpms.c	2010-01-15 15:50:43.000000000 +0000
@@ -31,7 +31,6 @@
 #include <X11/Xproto.h>			/* for CARD16 */
 #include <X11/extensions/dpms.h>
 #include <X11/Xlib.h>
-#include <X11/extensions/dpmsstr.h>
 
 static Display *dpy;
 


Index: ohm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ohm/F-12/ohm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ohm.spec	25 Jul 2009 20:38:02 -0000	1.5
+++ ohm.spec	15 Jan 2010 16:01:14 -0000	1.6
@@ -7,7 +7,7 @@
 Summary: Open Hardware Manager
 Name: ohm
 Version: 0.1.1
-Release: 10.22.%{alphatag}%{?dist}
+Release: 10.23.%{alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/ohm
 Source0: http://people.freedesktop.org/~hughsient/temp/%{name}-%{version}-1.%alphatag.tar.gz
 
@@ -25,6 +25,7 @@ Source0: http://people.freedesktop.org/~
 # Patch11: ohm-patch-reset-idle.diff
 # Patch12: ohm-patch-dcon-off-on-sleep.diff
 # Patch13: ohm-patch-disallow-prec.diff
+Patch13: ohm-0.1.1.buildfix.patch
 
 License: LGPL
 Group: System Environment/Libraries
@@ -69,7 +70,7 @@ Headers, static libraries and API docs f
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch13 -p1 -b .buildfix
 %build
 
 %configure --disable-docbook-docs --with-xauth-dir=/var/tmp/olpc-auth --with-os-type=redhat --docdir=%{_datadir}/doc/%{name}-%{version}
@@ -139,6 +140,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Fri Jan 15 2010 Caolán McNamara <caolanm at redhat.com> - 0.1.1-10.23.20080921git
+- Resolves: rhbz#539200 FTBFS
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-10.22.20080921git
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild