rpms/system-config-soundcard/F-7 system-config-soundcard-no-vendor.patch, NONE, 1.1 system-config-soundcard.spec, 1.56, 1.57

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/rpms/system-config-soundcard/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26837

Modified Files:
	system-config-soundcard.spec 
Added Files:
	system-config-soundcard-no-vendor.patch 
Log Message:
* Mon May 21 2007 Jeremy Katz <katzj at redhat.com> - 2.0.6-5
- fix case of no vendor being able to be found in the hal tree (#237709)


system-config-soundcard-no-vendor.patch:

--- NEW FILE system-config-soundcard-no-vendor.patch ---
Index: src/soundcardBackendHal.py
===================================================================
RCS file: /usr/local/CVS/redhat-config-soundcard/src/soundcardBackendHal.py,v
retrieving revision 1.1
diff -u -u -r1.1 soundcardBackendHal.py
--- src/soundcardBackendHal.py	30 Jun 2006 12:07:38 -0000	1.1
+++ src/soundcardBackendHal.py	21 May 2007 18:51:10 -0000
@@ -100,6 +100,7 @@
             if new_parentUdi == None:
                 break
             parentUdi = new_parentUdi
+        return ("Unknown", "Sound Device")
         
     def getBus(self, udi):
         parentUdi = udi


Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-soundcard/F-7/system-config-soundcard.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- system-config-soundcard.spec	11 Apr 2007 09:03:44 -0000	1.56
+++ system-config-soundcard.spec	21 May 2007 18:58:36 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: A graphical interface for detecting and configuring soundcards
 Name: system-config-soundcard
 Version: 2.0.6
-Release: 4%{dist}
+Release: 5%{dist}
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html
 License: GPL
 ExclusiveOS: Linux
@@ -11,6 +11,7 @@
 Source0: %{name}-%{version}.tar.bz2
 Patch: system-config-soundcard-2.0.6-dbus.patch
 Patch1: system-config-soundcard-2.0.6-update.patch
+Patch2: system-config-soundcard-no-vendor.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext, intltool
 ExcludeArch: s390 s390x
@@ -35,6 +36,7 @@
 %setup -q
 %patch -p1
 %patch1 -p1 -b .old
+%patch2 -p0 -b .novendor
 
 %build
 make
@@ -84,6 +86,9 @@
 %ghost /root/scsound.log
 
 %changelog
+* Mon May 21 2007 Jeremy Katz <katzj at redhat.com> - 2.0.6-5
+- fix case of no vendor being able to be found in the hal tree (#237709)
+
 * Wed Apr 11 2007 Martin Stransky <stransky at redhat.com> 2.0.6-4
 - fixed #227778 - Firstboot soundcard screen 'too wide' 
   with long name