packages: hal/hal.spec - quick fix for conflicting libusb variables in conf...

[sparky]

Author: sparky                       Date: Fri Dec 11 10:38:38 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- quick fix for conflicting libusb variables in configure.in

---- Files affected:
packages/hal:
   hal.spec (1.177 -> 1.178) 

---- Diffs:

================================================================
Index: packages/hal/hal.spec
diff -u packages/hal/hal.spec:1.177 packages/hal/hal.spec:1.178
--- packages/hal/hal.spec:1.177	Fri Dec 11 11:05:50 2009
+++ packages/hal/hal.spec	Fri Dec 11 11:38:32 2009
@@ -53,6 +53,7 @@
 BuildRequires:	python-modules
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.228
+BuildRequires:	sed >= 4.0
 BuildRequires:	which
 BuildRequires:	xmlto
 # R: cryptsetup-luks >= 1.0.1 (at runtime)
@@ -145,6 +146,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+sed '450,550 s/USE_LIBUSB/USE_LIBUSB_/g' -i configure.in
 
 %build
 %{__libtoolize}
@@ -298,6 +300,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.178  2009/12/11 10:38:32  sparky
+- quick fix for conflicting libusb variables in configure.in
+
 Revision 1.177  2009/12/11 10:05:50  sparky
 - BR: ConsoleKit-devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hal/hal.spec?r1=1.177&r2=1.178&f=u