rpms/libnjb/devel libnjb.perms, NONE, 1.1 libnjb.rules, NONE, 1.1 libnjb.spec, 1.4, 1.5

[Linus Walleij (snirkel)]

Author: snirkel

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

Modified Files:
	libnjb.spec 
Added Files:
	libnjb.perms libnjb.rules 
Log Message:
Fixes in resp to bug 178543



--- NEW FILE libnjb.perms ---
<libnjb>=/dev/libnjb*
<console> 0600 <libnjb> 0600 root


--- NEW FILE libnjb.rules ---
# libnjb.rules a udev rules file for libnjb devices
# created by Linus Walleij, ENJOY!

SUBSYSTEM!="usb_device", ACTION!="add", GOTO="nomad_rules_end"

# Creative Nomad Jukebox
SYSFS{idVendor}=="0471", SYSFS{idProduct}=="0222", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox 2
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4100", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox 3
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4101", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox Zen
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4108", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox Zen USB 2.0
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="410b", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox Zen NX
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4109", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox Zen Xtra
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4110", SYMLINK+="libnjb-%k"
# Dell Digital Jukebox
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4111", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox Zen Touch
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="411b", SYMLINK+="libnjb-%k"
# Creative Zen (Zen Micro variant)
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="411d", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox Zen Micro
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="411e", SYMLINK+="libnjb-%k"
# Second Generation Dell Digital Jukebox
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4126", SYMLINK+="libnjb-%k"
# Dell Pocket DJ
SYSFS{idVendor}=="041e", SYSFS{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"

LABEL="nomad_rules_end"


Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/libnjb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libnjb.spec	12 Oct 2005 18:46:48 -0000	1.4
+++ libnjb.spec	25 Jan 2006 21:12:33 -0000	1.5
@@ -6,21 +6,24 @@
 # test building a Fedora Extras package, define the following
 # two macros in .rpmmacros:
 #
-# %dist .fc4
-# %fedora 4
+# %dist .fc5
+# %fedora 5
 #
 
 Name:		libnjb
 Version:	2.2.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
 
 Group:		System Environment/Libraries
-Source:		http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source1:	libnjb.rules
+Source2:	libnjb.perms
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License:	BSD
-Requires:	hotplug
+Requires:	udev
+Requires:	pam
 BuildRequires:	libusb-devel
 BuildRequires:	zlib-devel
 BuildRequires:	ncurses-devel
@@ -67,10 +70,12 @@
 %makeinstall
 # Remove libtool archive remnant
 rm -f $RPM_BUILD_ROOT%{_libdir}/libnjb.la
-# Install hotplug scripts so they are up to date
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
-install -p -m 755 nomadjukebox $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
-install -p -m 644 nomad.usermap $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
+# Install udev rules file.
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-libnjb.rules
+# 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
 # Copy documentation to a good place
 install -p -m 644 AUTHORS ChangeLog ChangeLog-old FAQ \
 INSTALL LICENSE HACKING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -84,8 +89,8 @@
 %files
 %defattr(-, root, root)
 %{_libdir}/*.so.*
-%config(noreplace) %{_sysconfdir}/hotplug/usb/*
-
+%config(noreplace) %{_sysconfdir}/udev/rules.d/*
+%config(noreplace) %{_sysconfdir}/security/console.perms.d/*
 %files examples
 %defattr(-, root, root)
 %{_bindir}/*
@@ -100,6 +105,9 @@
 
 
 %changelog
+* Wed Jan 25 2006 Linus Walleij <triad at df.lth.se> 2.2.4-2
+- Fix udev problem, let go of hotplug, fix console perms.
+- Still working on libusb vs udev issues.
 * Wed Oct 12 2005 Linus Walleij <triad at df.lth.se> 2.2.4-1
 - New upstream release.
 * Mon Sep 19 2005 Linus Walleij <triad at df.lth.se> 2.2.3-1