From cbde10d9e0c50d176379079a6364e0f7b54aa747 Mon Sep 17 00:00:00 2001
From: Linus Walleij <snirkel@fedoraproject.org>
Date: Aug 17 2007 22:20:57 +0000
Subject: Fix udev rules, bug #249027


---

diff --git a/libnjb.rules b/libnjb.rules
index cf7450c..38b7eb1 100644
--- a/libnjb.rules
+++ b/libnjb.rules
@@ -1,37 +1,41 @@
 # libnjb.rules a udev rules file for libnjb devices
 # created by Linus Walleij, ENJOY!
 
-SUBSYSTEM!="usb_device", ACTION!="add", GOTO="nomad_rules_end"
+ACTION!="add", GOTO="nomad_rules_end"
+SUBSYSTEM=="usb", GOTO="nomad_rules"
+SUBSYSTEM=="usb_device", GOTO="nomad_rules"
+
+GOTO="nomad_rules_end"
+
+LABEL="nomad_rules"
 
 # Creative Nomad Jukebox
-SYSFS{idVendor}=="0471", SYSFS{idProduct}=="0222", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="0471", ATTR{idProduct}=="0222", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox 2
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4100", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4100", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox 3
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4101", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4101", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox Zen
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4108", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4108", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox Zen USB 2.0
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="410b", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="410b", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox Zen NX
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4109", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4109", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox Zen Xtra
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4110", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4110", SYMLINK+="libnjb-%k"
 # Dell Digital Jukebox
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4111", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4111", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox Zen Touch
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="411b", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="411b", SYMLINK+="libnjb-%k"
 # Creative Zen (Zen Micro variant)
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="411d", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="411d", SYMLINK+="libnjb-%k"
 # Creative Nomad Jukebox Zen Micro
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="411e", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="411e", SYMLINK+="libnjb-%k"
 # Second Generation Dell Digital Jukebox
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4126", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4126", SYMLINK+="libnjb-%k"
 # Dell Pocket DJ
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4127", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4127", SYMLINK+="libnjb-%k"
 # Creative Zen Sleek
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4136", SYMLINK+="libnjb-%k"
-# Third Generation Dell Digital Jukebox
-SYSFS{idVendor}=="041e", SYSFS{idProduct}=="412f", SYMLINK+="libnjb-%k"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4136", SYMLINK+="libnjb-%k"
 
 LABEL="nomad_rules_end"
diff --git a/libnjb.spec b/libnjb.spec
index e627bb5..7d50a43 100644
--- a/libnjb.spec
+++ b/libnjb.spec
@@ -1,18 +1,9 @@
 # SPEC file for libnjb, primary target is the Fedora Extras
 # RPM repository.
-#
-# For testing a certain distribution, rely on macros that
-# you define in your ".rpmmacros" file. For example, for
-# test building a Fedora Extras package, define the following
-# two macros in .rpmmacros:
-#
-# %dist .fc5
-# %fedora 5
-#
 
 Name:		libnjb
 Version:	2.2.5
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
 
@@ -105,6 +96,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 17 2007 Linus Walleij <triad@df.lth.se> 2.2.5-4
+- Fixup libnjb udev rules to work with new udev and HAL.
 * Mon Aug 28 2006 Linus Walleij <triad@df.lth.se> 2.2.5-3
 - Rebuild for Fedora Extras 6.
 * Tue Feb 14 2006 Linus Walleij <triad@df.lth.se> 2.2.5-2