rpms/libnjb/F-7 libnjb.rules, 1.1, 1.2 libnjb.spec, 1.8, 1.9 sources, 1.6, 1.7

Linus Walleij (snirkel) fedora-extras-commits at redhat.com
Thu Sep 6 11:26:29 UTC 2007 

Author: snirkel

Update of /cvs/extras/rpms/libnjb/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32619

Modified Files:
	libnjb.rules libnjb.spec sources 
Log Message:
New upstream release, fix udev rules, add HAL FDI file.



Index: libnjb.rules
===================================================================
RCS file: /cvs/extras/rpms/libnjb/F-7/libnjb.rules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libnjb.rules	25 Jan 2006 21:12:33 -0000	1.1
+++ libnjb.rules	6 Sep 2007 11:25:56 -0000	1.2
@@ -1,37 +1,76 @@
-# libnjb.rules a udev rules file for libnjb devices
-# created by Linus Walleij, ENJOY!
+# nomad.rules a udev rules file for NOMAD jukeboxes.
+# Put this file in /etc/udev/rules.d
+# Hacked a bit for Fedora along the lines of libsane rules.
 
-SUBSYSTEM!="usb_device", ACTION!="add", GOTO="nomad_rules_end"
+ACTION!="add", GOTO="nomad_rules_end"
+ATTR{dev}!="?*", GOTO="nomad_rules_end"
+SUBSYSTEM=="usb", GOTO="nomad_usb_rules"
+SUBSYSTEM=="usb_device", GOTO="nomad_usb_device_rules"
+GOTO="nomad_rules_end"
+
+LABEL="nomad_usb_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"
+
+GOTO="nomad_rules_end"
+
+LABEL="nomad_usb_device_rules"
+
+# Creative Nomad Jukebox
+ATTRS{idVendor}=="0471", ATTRS{idProduct}=="0222", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox 2
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4100", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox 3
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4101", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4108", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen USB 2.0
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="410b", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen NX
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4109", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen Xtra
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4110", SYMLINK+="libnjb-%k"
+# Dell Digital Jukebox
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4111", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen Touch
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="411b", SYMLINK+="libnjb-%k"
+# Creative Zen (Zen Micro variant)
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="411d", SYMLINK+="libnjb-%k"
+# Creative Nomad Jukebox Zen Micro
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="411e", SYMLINK+="libnjb-%k"
+# Second Generation Dell Digital Jukebox
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4126", SYMLINK+="libnjb-%k"
+# Dell Pocket DJ
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4127", SYMLINK+="libnjb-%k"
+# Creative Zen Sleek
+ATTRS{idVendor}=="041e", ATTRS{idProduct}=="4136", SYMLINK+="libnjb-%k"
+
 
 LABEL="nomad_rules_end"


Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/F-7/libnjb.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libnjb.spec	28 Aug 2006 16:23:06 -0000	1.8
+++ libnjb.spec	6 Sep 2007 11:25:56 -0000	1.9
@@ -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}
+Version:	2.2.6
+Release:	1%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
 
@@ -76,6 +67,8 @@
 # Install device permissions
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/60-libnjb.perms
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop
+install -p -m 644 libnjb.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libnjb.fdi
 # Copy documentation to a good place
 install -p -m 644 AUTHORS ChangeLog ChangeLog-old FAQ \
 INSTALL LICENSE HACKING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -91,6 +84,7 @@
 %{_libdir}/*.so.*
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*
+%config(noreplace) %{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libnjb.fdi
 %files examples
 %defattr(-, root, root)
 %{_bindir}/*
@@ -105,6 +99,12 @@
 
 
 %changelog
+* Wed Sep 5 2007 Linus Walleij <triad at df.lth.se> 2.2.6-1
+- Long overdue upstream release.
+- Shape up udev rules so they look like the libsane stuff.
+- Add HAL FDI file.
+* Fri Aug 17 2007 Linus Walleij <triad at 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 at df.lth.se> 2.2.5-3
 - Rebuild for Fedora Extras 6.
 * Tue Feb 14 2006 Linus Walleij <triad at df.lth.se> 2.2.5-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnjb/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Jan 2006 21:17:38 -0000	1.6
+++ sources	6 Sep 2007 11:25:56 -0000	1.7
@@ -1 +1 @@
-f7461574b9a28ed1c79fb40d3d307d78  libnjb-2.2.5.tar.gz
+e1b3a89f6157c553ea46a78446429a0d  libnjb-2.2.6.tar.gz

More information about the fedora-extras-commits mailing list