rpms/libnjb/devel .cvsignore, 1.6, 1.7 libnjb.rules, 1.2, 1.3 libnjb.spec, 1.9, 1.10 sources, 1.6, 1.7

Linus Walleij (snirkel) fedora-extras-commits at redhat.com
Wed Sep 5 21:53:37 UTC 2007


Author: snirkel

Update of /cvs/extras/rpms/libnjb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27400

Modified Files:
	.cvsignore libnjb.rules libnjb.spec sources 
Log Message:
New upstream version, include HAL FDI file.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Jan 2006 21:17:38 -0000	1.6
+++ .cvsignore	5 Sep 2007 21:53:04 -0000	1.7
@@ -1 +1 @@
-libnjb-2.2.5.tar.gz
+libnjb-2.2.6.tar.gz


Index: libnjb.rules
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/libnjb.rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libnjb.rules	17 Aug 2007 22:20:57 -0000	1.2
+++ libnjb.rules	5 Sep 2007 21:53:04 -0000	1.3
@@ -1,13 +1,14 @@
-# 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.
 
 ACTION!="add", GOTO="nomad_rules_end"
-SUBSYSTEM=="usb", GOTO="nomad_rules"
-SUBSYSTEM=="usb_device", GOTO="nomad_rules"
-
+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_rules"
+LABEL="nomad_usb_rules"
 
 # Creative Nomad Jukebox
 ATTR{idVendor}=="0471", ATTR{idProduct}=="0222", SYMLINK+="libnjb-%k"
@@ -38,4 +39,38 @@
 # Creative Zen Sleek
 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/devel/libnjb.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libnjb.spec	17 Aug 2007 22:20:57 -0000	1.9
+++ libnjb.spec	5 Sep 2007 21:53:04 -0000	1.10
@@ -2,8 +2,8 @@
 # RPM repository.
 
 Name:		libnjb
-Version:	2.2.5
-Release:	4%{?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/
 
@@ -67,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}
@@ -82,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}/*
@@ -96,6 +99,10 @@
 
 
 %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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/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	5 Sep 2007 21:53:04 -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