[midisport-firmware] Use ATTRS idVendor/idProduct/bcdDevice to match devices in udev rules (#718904) Expand package descr

[Charles R. Anderson]

commit 8c5d2b4cbc84420764446ff6d77adcea9bf97295
Author: Chuck Anderson <cra at wpi.edu>
Date:   Wed Jul 13 22:22:23 2011 -0400

    Use ATTRS idVendor/idProduct/bcdDevice to match devices in udev rules (#718904)
    Expand package description

 midisport-firmware-1.2-udev-attrs.patch |   28 ++++++++++++++++++++
 midisport-firmware.spec                 |   42 ++++++++++++++++++++++--------
 2 files changed, 59 insertions(+), 11 deletions(-)
---
diff --git a/midisport-firmware-1.2-udev-attrs.patch b/midisport-firmware-1.2-udev-attrs.patch
new file mode 100644
index 0000000..83e7295
--- /dev/null
+++ b/midisport-firmware-1.2-udev-attrs.patch
@@ -0,0 +1,28 @@
+diff -up midisport-firmware-1.2/42-midisport-firmware.rules.in.attrs midisport-firmware-1.2/42-midisport-firmware.rules.in
+--- midisport-firmware-1.2/42-midisport-firmware.rules.in.attrs	2006-03-05 16:01:45.000000000 -0500
++++ midisport-firmware-1.2/42-midisport-firmware.rules.in	2011-07-13 22:07:21.153974244 -0400
+@@ -1,18 +1,15 @@
+ # midisport-firmware.rules - udev rules for loading firmware into MidiSport devices
+ 
+-# DEVPATH=="/*.0" selects interface 0 only
+-# (some udev versions don't work with SYSFS{bInterfaceNumber})
+-
+ # MidiSport 2x2
+-ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1001/*", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport2x2.ihx"
++ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0763", ATTRS{idProduct}=="1001", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport2x2.ihx -D %N"
+ # MidiSport 1x1
+-ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1010/*", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport1x1.ihx"
++ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0763", ATTRS{idProduct}=="1010", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport1x1.ihx -D %N"
+ # KeyStation
+-ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1014/*", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSportKS.ihx"
++ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0763", ATTRS{idProduct}=="1014", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSportKS.ihx -D %N"
+ # MidiSport 4x4
+-ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1020/*", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport4x4.ihx"
++ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0763", ATTRS{idProduct}=="1020", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport4x4.ihx -D %N"
+ # MidiSport 8x8
+-ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1031/110", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport8x8-2.10.ihx"
+-ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1031/121", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport8x8-2.21.ihx"
++ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0763", ATTRS{idProduct}=="1031", ATTRS{bcdDevice}=="0110", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport8x8-2.10.ihx -D %N"
++ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0763", ATTRS{idProduct}=="1031", ATTRS{bcdDevice}=="0121", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport8x8-2.21.ihx -D %N"
+ 
+ # vim: ft=conf
diff --git a/midisport-firmware.spec b/midisport-firmware.spec
index e08fcdc..ddae368 100644
--- a/midisport-firmware.spec
+++ b/midisport-firmware.spec
@@ -1,20 +1,36 @@
-Name:           midisport-firmware
-Version:        1.2
-Release:        7%{dist}
-Summary:        Firmware for the M-Audio/Midiman USB MIDI and Audio devices
-Group:          System Environment/Kernel
-License:        (MIT or GPLv2+) and Redistributable, no modification permitted
-URL:            http://usb-midi-fw.sourceforge.net/
+Name:		midisport-firmware
+Version:	1.2
+Release:	8%{dist}
+Summary:	Firmware for the M-Audio/Midiman USB MIDI and Audio devices
+Group:		System Environment/Kernel
+License:	(MIT or GPLv2+) and Redistributable, no modification permitted
+URL:		http://usb-midi-fw.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/usb-midi-fw/midisport-firmware-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
-Requires:       fxload
+Patch0:		midisport-firmware-1.2-udev-attrs.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
+Requires:	fxload
 
 %description
-This package contains the firmware for M-Audio/Midiman USB MIDI & Audio devices
+This package contains the firmware for M-Audio/Midiman USB MIDI & Audio devices.
+
+Supported devices:
+ - MidiSport 1x1
+ - MidiSport 2x2
+ - MidiSport 4x4
+ - MidiSport 8x8
+ - MidiSport Uno
+ - Keystation
+ - Oxygen
+ - Radium
+
+(You don't need a firmware download for the USB Audio Quattro, Duo, or
+MidiSport 2x4.)
+
 
 %prep
 %setup -q
+%patch0 -p1 -b .attrs
 
 %build
 sed -i -e 's|@fxload@|/sbin/fxload|g' -e 's|@firmwaredir@|/lib/firmware|g' 42-midisport-firmware.rules.in
@@ -43,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/udev/rules.d/42-midisport-firmware.rules
 
 %changelog
+* Wed Jul 13 2011 Charles R. Anderson <cra at wpi.edu> - 1.2-8
+- Use ATTRS idVendor/idProduct/bcdDevice to match devices in udev rules (#718904)
+- Expand package description
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild