rpms/sane-backends/devel sane-backends.spec, 1.49, 1.50 libsane.usermap, 1.1, NONE libusbscanner, 1.11, NONE

[fedora-cvs-commits at redhat.com]

Author: notting

Update of /cvs/dist/rpms/sane-backends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25270

Modified Files:
	sane-backends.spec 
Removed Files:
	libsane.usermap libusbscanner 
Log Message:
Add udev rules file, remove hotplug.d files (#177650)



Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sane-backends.spec	23 Jan 2006 04:31:36 -0000	1.49
+++ sane-backends.spec	25 Jan 2006 21:10:50 -0000	1.50
@@ -4,12 +4,11 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.17
-Release: 2
+Release: 3
 License: GPL (programs), relaxed LGPL (libraries), and public domain (docs)
 Group: System Environment/Libraries
 Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
 Source1: sane.png
-Source2: libusbscanner
 Patch1: sane-backends-1.0.11-rpath.patch
 Patch3: sane-backends-1.0.12-badcode.patch
 Patch5: sane-backends-multilib.patch
@@ -20,7 +19,7 @@
 BuildRequires: gphoto2-devel
 %endif
 Prereq: /sbin/ldconfig, /bin/mktemp, /bin/grep, /bin/cat, /bin/rm
-Requires: pam >= 0.78-2
+Requires: pam >= 0.78-2, udev
 ExcludeArch: s390 s390x
 
 %description
@@ -94,9 +93,11 @@
 install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps
 rm -f %{buildroot}%{_bindir}/gamma4scanimage
 rm -f %{buildroot}%{_libdir}/sane/*.a %{buildroot}%{_libdir}/*.a
-mkdir -p %{buildroot}%{_sysconfdir}/hotplug/usb
-install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/hotplug/usb
-install -m 644 tools/hotplug/libsane.usermap %{buildroot}%{_sysconfdir}/hotplug/usb
+mkdir -p %{buildroot}/%{_sysconfdir}/udev/rules.d/
+
+sh tools/udev/convert-usermap.sh tools/hotplug/libsane.usermap
+
+sed 's|MODE="660", GROUP="scanner"|SYMLINK+="scanner-%k"|g' libsane.rules > %{buildroot}/%{_sysconfdir}/udev/rules.d/60-libsane.rules
 
 %find_lang %name
 
@@ -111,7 +112,7 @@
 %defattr(-,root,root)
 %dir /etc/sane.d
 %config(noreplace) /etc/sane.d/*
-%{_sysconfdir}/hotplug/usb/*
+%{_sysconfdir}/udev/rules.d/*
 %{_bindir}/sane-find-scanner
 %{_bindir}/scanimage
 %{_sbindir}/*
@@ -132,6 +133,9 @@
 %{_libdir}/sane/*.so
 
 %changelog
+* Wed Jan 25 2006 Bill Nottingham <notting at redhat.com> 1.0.17-3
+- ship udev rules for device creation (#177650). Require udev
+
 * Sun Jan 22 2006 Bill Nottingham <notting at redhat.com> 1.0.17-2
 - disable hotplug dep. More later pending (#177650)
 


--- libsane.usermap DELETED ---


--- libusbscanner DELETED ---