[libnjb: 1/2] New udev rule tag

[Linus Walleij]

commit 78c15fa141fa6962a069728b0626af079a8f1853
Author: Linus Walleij <linus.walleij at stericsson.com>
Date:   Wed Jun 15 20:43:37 2011 +0200

    New udev rule tag

 libnjb.rules |   28 ++++++++++++++--------------
 libnjb.spec  |    4 +++-
 2 files changed, 17 insertions(+), 15 deletions(-)
---
diff --git a/libnjb.rules b/libnjb.rules
index d03bd48..d3238be 100644
--- a/libnjb.rules
+++ b/libnjb.rules
@@ -10,32 +10,32 @@ GOTO="nomad_rules_end"
 LABEL="nomad_usb_rules"
 
 # Creative Nomad Jukebox
-ATTR{idVendor}=="0471", ATTR{idProduct}=="0222", SYMLINK+="libnjb-%k", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
+ATTR{idVendor}=="0471", ATTR{idProduct}=="0222", SYMLINK+="libnjb-%k", ENV{ID_LIBNJB_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
 # Creative Nomad Jukebox 2
-ATTR{idVendor}=="041e", ATTR{idProduct}=="4100", SYMLINK+="libnjb-%k", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4100", SYMLINK+="libnjb-%k", ENV{ID_LIBNJB_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
 # Creative Nomad Jukebox 3
-ATTR{idVendor}=="041e", ATTR{idProduct}=="4101", SYMLINK+="libnjb-%k", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4101", SYMLINK+="libnjb-%k", ENV{ID_LIBNJB_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
 # Creative Nomad Jukebox Zen
-ATTR{idVendor}=="041e", ATTR{idProduct}=="4108", SYMLINK+="libnjb-%k", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4108", SYMLINK+="libnjb-%k", ENV{ID_LIBNJB_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
 # Creative Nomad Jukebox Zen USB 2.0
-ATTR{idVendor}=="041e", ATTR{idProduct}=="410b", SYMLINK+="libnjb-%k", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="410b", SYMLINK+="libnjb-%k", ENV{ID_LIBNJB_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
 # Creative Nomad Jukebox Zen NX
-ATTR{idVendor}=="041e", ATTR{idProduct}=="4109", SYMLINK+="libnjb-%k", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4109", SYMLINK+="libnjb-%k", ENV{ID_LIBNJB_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
 # Creative Nomad Jukebox Zen Xtra
-ATTR{idVendor}=="041e", ATTR{idProduct}=="4110", SYMLINK+="libnjb-%k", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4110", SYMLINK+="libnjb-%k", ENV{ID_LIBNJB_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
 # Dell Digital Jukebox
-ATTR{idVendor}=="041e", ATTR{idProduct}=="4111", SYMLINK+="libnjb-%k", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4111", SYMLINK+="libnjb-%k", ENV{ID_LIBNJB_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
 # Creative Nomad Jukebox Zen Touch
-ATTR{idVendor}=="041e", ATTR{idProduct}=="411b", SYMLINK+="libnjb-%k", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="411b", SYMLINK+="libnjb-%k", ENV{ID_LIBNJB_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
 # Creative Zen (Zen Micro variant)
-ATTR{idVendor}=="041e", ATTR{idProduct}=="411d", SYMLINK+="libnjb-%k", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="411d", SYMLINK+="libnjb-%k", ENV{ID_LIBNJB_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
 # Creative Nomad Jukebox Zen Micro
-ATTR{idVendor}=="041e", ATTR{idProduct}=="411e", SYMLINK+="libnjb-%k", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="411e", SYMLINK+="libnjb-%k", ENV{ID_LIBNJB_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
 # Second Generation Dell Digital Jukebox
-ATTR{idVendor}=="041e", ATTR{idProduct}=="4126", SYMLINK+="libnjb-%k", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4126", SYMLINK+="libnjb-%k", ENV{ID_LIBNJB_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
 # Dell Pocket DJ
-ATTR{idVendor}=="041e", ATTR{idProduct}=="4127", SYMLINK+="libnjb-%k", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4127", SYMLINK+="libnjb-%k", ENV{ID_LIBNJB_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
 # Creative Zen Sleek
-ATTR{idVendor}=="041e", ATTR{idProduct}=="4136", SYMLINK+="libnjb-%k", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
+ATTR{idVendor}=="041e", ATTR{idProduct}=="4136", SYMLINK+="libnjb-%k", ENV{ID_LIBNJB_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="udev-acl"
 
 LABEL="nomad_rules_end"
diff --git a/libnjb.spec b/libnjb.spec
index 1a6c7c1..cb19205 100644
--- a/libnjb.spec
+++ b/libnjb.spec
@@ -3,7 +3,7 @@
 
 Name:		libnjb
 Version:	2.2.6
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
 
@@ -104,6 +104,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jun 15 2011 Linus Walleij <triad at df.lth.se> 2.2.6-9
+- Tag libnjb devices with a specific ID for autodetection
 * Sat Dec 4 2010 Linus Walleij <triad at df.lth.se> 2.2.6-8
 - Fix up ages old udev rules to match latest standards.
 * Sat Dec 4 2010 Linus Walleij <triad at df.lth.se> 2.2.6-7