From 9e905eccdfa834baa5367cb88ab322b8051c399f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Jan 25 2006 21:10:50 +0000 Subject: Add udev rules file, remove hotplug.d files (#177650) --- diff --git a/sane-backends.spec b/sane-backends.spec index 7a79a47..c6318cb 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -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: tetex-latex libusb-devel libieee1284-devel libjpeg-devel 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 @@ mkdir -p %{buildroot}%{_datadir}/pixmaps 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 @@ rm -rf %{buildroot} %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 @@ rm -rf %{buildroot} %{_libdir}/sane/*.so %changelog +* Wed Jan 25 2006 Bill Nottingham 1.0.17-3 +- ship udev rules for device creation (#177650). Require udev + * Sun Jan 22 2006 Bill Nottingham 1.0.17-2 - disable hotplug dep. More later pending (#177650)