rpms/hal/F-8 hal-0.5.10-int_outof-fix.patch, NONE, 1.1 hal.spec, 1.140, 1.141

Daniel Williams (dcbw) fedora-extras-commits at redhat.com
Sat Jun 7 22:06:37 UTC 2008


Author: dcbw

Update of /cvs/pkgs/rpms/hal/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv941

Modified Files:
	hal.spec 
Added Files:
	hal-0.5.10-int_outof-fix.patch 
Log Message:
* Sat Jun 07 2008 Dan Williams <dcbw at redhat.com> - 0.5.10-2
- Fix problems parsing fdi files with int_outof directives



hal-0.5.10-int_outof-fix.patch:

--- NEW FILE hal-0.5.10-int_outof-fix.patch ---
commit 4a75be3cee0cc71b694296bdc679ed0578fabf4a
Author: Frederic Crozat <fcrozat at mandriva.com>
Date:   Mon Nov 5 19:44:14 2007 +0100

    fix for int_outof
    
    I discovered a bug in int_outof implementation, which wasn't working
     at all and I fixed it while discussing with David over IRC.
    
    But it seems my patch never got committed, Here it is

diff --git a/hald/create_cache.c b/hald/create_cache.c
index 0250456..384ed6a 100644
--- a/hald/create_cache.c
+++ b/hald/create_cache.c
@@ -142,7 +142,7 @@ get_match_type(const char *str)
 	if (strcmp (str, "contains_outof") == 0)
 		return MATCH_CONTAINS_OUTOF;
 	if (strcmp (str, "int_outof") == 0)
-		return MATCH_CONTAINS_OUTOF;
+		return MATCH_INT_OUTOF;
 	if (strcmp (str, "prefix_outof") == 0)
 		return MATCH_PREFIX_OUTOF;
 	if (strcmp (str, "string_outof") == 0)


Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/F-8/hal.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- hal.spec	4 Mar 2008 12:00:48 -0000	1.140
+++ hal.spec	7 Jun 2008 22:05:51 -0000	1.141
@@ -26,10 +26,11 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.10
-Release: 1%{?dist}.2
+Release: 2%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Patch0: hal-0.5.10-acltool-serialize.patch
+Patch1: hal-0.5.10-int_outof-fix.patch
 
 License: AFL/GPL
 Group: System Environment/Libraries
@@ -122,6 +123,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .serialize-acl
+%patch1 -p1 -b .int_outof-fix
 
 %build
 %configure --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version} --with-os-type=redhat --enable-console-kit --enable-policy-kit --enable-acl-management --enable-umount-helper --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject
@@ -234,6 +236,9 @@
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Sat Jun 07 2008 Dan Williams <dcbw at redhat.com> - 0.5.10-2
+- Fix problems parsing fdi files with int_outof directives
+
 * Tue Mar 04 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.5.10-1.2
 - Replace patch added in previous revision with upstream one (#384271)
 




More information about the fedora-extras-commits mailing list