rpms/kudzu/FC-4 kudzu-1.1.116.2-macio-sound.patch, NONE, 1.1.2.1 kudzu.spec, 1.82, 1.82.2.1

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/kudzu/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv32313

Modified Files:
      Tag: private-fc4-pegasos-branch
	kudzu.spec 
Added Files:
      Tag: private-fc4-pegasos-branch
	kudzu-1.1.116.2-macio-sound.patch 
Log Message:
fix snd-powermac for non-mac

kudzu-1.1.116.2-macio-sound.patch:
 macio.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kudzu-1.1.116.2-macio-sound.patch ---
--- kudzu-1.1.116.2/macio.c~	2005-04-25 23:09:53.000000000 +0100
+++ kudzu-1.1.116.2/macio.c	2005-08-15 11:13:43.000000000 +0100
@@ -153,7 +153,7 @@ struct device *macioProbe( enum deviceCl
 	// Supported
 	for (n = list->result->next; n != list->result; n = n->next)
 	{
-		if (n->path)
+		if (n->path && strstr(n->path, "mac-io"))
 			ret = 1;
 	}
 


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/FC-4/kudzu.spec,v
retrieving revision 1.82
retrieving revision 1.82.2.1
diff -u -r1.82 -r1.82.2.1
--- kudzu.spec	19 May 2005 19:52:56 -0000	1.82
+++ kudzu.spec	15 Aug 2005 10:23:33 -0000	1.82.2.1
@@ -1,11 +1,12 @@
 Name: kudzu
 Version: 1.1.116.2
-Release: 2
+Release: 2.pegasos
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
 Group: Applications/System
 URL: http://fedora.redhat.com/projects/additional-projects/kudzu/
 Source: kudzu-%{PACKAGE_VERSION}.tar.gz
+Patch0: kudzu-1.1.116.2-macio-sound.patch
 Obsoletes: rhs-hwdiag setconsole
 Prereq: chkconfig, modutils >= 2.3.11-5, /etc/init.d
 Requires: pam >= 0.74-17, hwdata
@@ -15,6 +16,7 @@
 Requires: hwdata >= 0.116-1, hal >= 0.2.96
 BuildPrereq: pciutils-devel >= 2.1.99.test8-3, python-devel python gettext
 BuildRoot: %{_tmppath}/%{name}-root
+ExclusiveArch: ppc
 
 %description
 Kudzu is a hardware probing tool run at system boot time to determine
@@ -32,6 +34,7 @@
 %prep
 
 %setup
+%patch0 -p1 -b .macsnd
 
 # hack: do not start kudzu on s390/s390x on bootup
 %ifarch s390 s390x
@@ -80,6 +83,9 @@
 %{_includedir}/kudzu
 
 %changelog
+* Mon Aug 15 2005 David Woodhouse <dwmw2 at redhat.com> 1.1.116.2-2.pegasos
+- Assume snd-powermac only if the sound node is on mac-io
+
 * Thu May 19 2005 Bill Nottingham <notting at redhat.com> 1.1.116.2-2
 - rebuild against new libpci