rpms/sane-backends
7
0
Fork 0
Code Issues Pull Requests Releases Activity

reorder udev rules tweaking (#244444)

Browse Source
This commit is contained in:
Nils Philippsen 2007-07-22 21:04:15 +00:00
parent eccefc9894
commit 60539e0773
4 changed files with 2634 additions and 1056 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2092
sane-backends-1.0.18-udev-098.patch
View File

File diff suppressed because it is too large Load Diff

6
sane-backends-1.0.18-udev-new-kernels.patch
View File

@ -1,5 +1,5 @@
--- sane-backends-1.0.18/tools/udev/libsane.rules.udev-new-kernels 2006-07-03 00:29:29.000000000 +0200
+++ sane-backends-1.0.18/tools/udev/libsane.rules 2007-07-20 17:24:49.000000000 +0200
--- sane-backends-1.0.18/tools/udev/libsane.rules.udev-new-kernels 2007-07-22 22:49:51.000000000 +0200
+++ sane-backends-1.0.18/tools/udev/libsane.rules 2007-07-22 22:49:52.000000000 +0200
@@ -15,7 +15,7 @@
#
@ -8,4 +8,4 @@
+SUBSYSTEM!="usb|usb_device", GOTO="libsane_rules_end"
# Hewlett-Packard ScanJet 4100C
SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="0101", MODE="660", GROUP="scanner"
SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="0101", SYMLINK+="scanner-%k"

1573
sane-backends-1.0.18-udev-symlink.patch Normal file
View File

File diff suppressed because it is too large Load Diff

19
sane-backends.spec
View File

@ -24,7 +24,7 @@
Summary: Scanner access software
Name: sane-backends
Version: 1.0.18
Release: 9%{?dist}
Release: 10%{?dist}
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
@ -35,8 +35,9 @@ Patch3: sane-backends-multilib.patch
Patch4: sane-backends-1.0.17-pkgconfig.patch
Patch5: sane-backends-1.0.18-logical_vs_binary.patch
Patch6: sane-backends-1.0.18-usb_reset.patch
Patch7: sane-backends-1.0.18-udev-new-kernels.patch
Patch8: sane-backends-1.0.18-udev-098.patch
Patch7: sane-backends-1.0.18-udev-symlink.patch
Patch8: sane-backends-1.0.18-udev-new-kernels.patch
Patch9: sane-backends-1.0.18-udev-098.patch
URL: http://www.sane-project.org
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
BuildRequires: tetex-latex libusb-devel libieee1284-devel libjpeg-devel
@ -122,10 +123,11 @@ want to access digital cameras.
%patch4 -p1 -b .pkgconfig
%patch5 -p1 -b .logical_vs_binary
%patch6 -p1 -b .usb_reset
%patch7 -p1 -b .udev-new-kernels
%patch7 -p1 -b .udev-symlink
%patch8 -p1 -b .udev-new-kernels
%if %udev_098
%patch8 -p1 -b .udev-098
%patch9 -p1 -b .udev-098
%endif
for i in agfafocus avision coolscan2 umax_pp; do
@ -160,9 +162,9 @@ rm -f %{buildroot}%{_bindir}/gamma4scanimage
rm -f %{buildroot}%{_mandir}/man1/gamma4scanimage.1*
rm -f %{buildroot}%{_libdir}/sane/*.a %{buildroot}%{_libdir}/*.a
rm -f %{buildroot}%{_libdir}/libsane*.la %{buildroot}%{_libdir}/sane/*.la
mkdir -p %{buildroot}/%{_sysconfdir}/udev/rules.d/
sed 's|MODE="660", GROUP="scanner"|SYMLINK+="scanner-%k"|g' tools/udev/libsane.rules > %{buildroot}/%{_sysconfdir}/udev/rules.d/60-libsane.rules
mkdir -p %{buildroot}/%{_sysconfdir}/udev/rules.d/
install -m 0644 tools/udev/libsane.rules %{buildroot}/%{_sysconfdir}/udev/rules.d/60-libsane.rules
%find_lang %name
@ -246,6 +248,9 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/sane-backends.pc
%changelog
* Sun Jul 22 2007 Nils Philippsen <nphilipp@redhat.com> - 1.0.18-10
- reorder udev rules tweaking (#244444)
* Fri Jul 20 2007 Nils Philippsen <nphilipp@redhat.com> - 1.0.18-9
- don't tweak device names in device configuration files anymore (obsolete)
- let udev rules cope with SUBSYSTEM=="usb" (#244444)