tweak udev rules to conform with new udev syntax (#246849)
This commit is contained in:
parent
b08dfaad78
commit
473d2b16ca
1573
sane-backends-1.0.18-tweak-udev-rules.patch
Normal file
1573
sane-backends-1.0.18-tweak-udev-rules.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -15,10 +15,16 @@
|
|||||||
%define docs_split 0%{?!_without_docs_split:1}
|
%define docs_split 0%{?!_without_docs_split:1}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?fedora} >= 7 || 0%{?rhel} >= 6
|
||||||
|
%define tweak_udev_rules 0%{?!_without_tweak_udev_rules:1}
|
||||||
|
%else
|
||||||
|
%define tweak_udev_rules 0%{?_with_tweak_udev_rules:1}
|
||||||
|
%endif
|
||||||
|
|
||||||
Summary: Scanner access software
|
Summary: Scanner access software
|
||||||
Name: sane-backends
|
Name: sane-backends
|
||||||
Version: 1.0.18
|
Version: 1.0.18
|
||||||
Release: 7%{?dist}
|
Release: 8%{?dist}
|
||||||
License: GPL (programs), relaxed LGPL (libraries), and public domain (docs)
|
License: GPL (programs), relaxed LGPL (libraries), and public domain (docs)
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
|
Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
|
||||||
@ -29,6 +35,7 @@ Patch3: sane-backends-multilib.patch
|
|||||||
Patch4: sane-backends-1.0.17-pkgconfig.patch
|
Patch4: sane-backends-1.0.17-pkgconfig.patch
|
||||||
Patch5: sane-backends-1.0.18-logical_vs_binary.patch
|
Patch5: sane-backends-1.0.18-logical_vs_binary.patch
|
||||||
Patch6: sane-backends-1.0.18-usb_reset.patch
|
Patch6: sane-backends-1.0.18-usb_reset.patch
|
||||||
|
Patch7: sane-backends-1.0.18-tweak-udev-rules.patch
|
||||||
URL: http://www.sane-project.org
|
URL: http://www.sane-project.org
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
|
||||||
BuildRequires: tetex-latex libusb-devel libieee1284-devel libjpeg-devel
|
BuildRequires: tetex-latex libusb-devel libieee1284-devel libjpeg-devel
|
||||||
@ -38,7 +45,11 @@ BuildRequires: gettext
|
|||||||
BuildRequires: gphoto2-devel
|
BuildRequires: gphoto2-devel
|
||||||
%endif
|
%endif
|
||||||
Requires: pam >= 0.78-2
|
Requires: pam >= 0.78-2
|
||||||
|
%if %tweak_udev_rules
|
||||||
|
Requires: udev >= 106
|
||||||
|
%else
|
||||||
Requires: udev
|
Requires: udev
|
||||||
|
%endif
|
||||||
Requires: libsane-hpaio
|
Requires: libsane-hpaio
|
||||||
ExcludeArch: s390 s390x
|
ExcludeArch: s390 s390x
|
||||||
|
|
||||||
@ -111,6 +122,10 @@ want to access digital cameras.
|
|||||||
%patch5 -p1 -b .logical_vs_binary
|
%patch5 -p1 -b .logical_vs_binary
|
||||||
%patch6 -p1 -b .usb_reset
|
%patch6 -p1 -b .usb_reset
|
||||||
|
|
||||||
|
%if %tweak_udev_rules
|
||||||
|
%patch7 -p1 -b .tweak_udev_rules
|
||||||
|
%endif
|
||||||
|
|
||||||
# Fix bug #62847.
|
# Fix bug #62847.
|
||||||
perl -pi -e 's,/dev/usbscanner0?,/dev/usb/scanner0,' backend/*.conf
|
perl -pi -e 's,/dev/usbscanner0?,/dev/usb/scanner0,' backend/*.conf
|
||||||
|
|
||||||
@ -232,6 +247,9 @@ rm -rf %{buildroot}
|
|||||||
%{_libdir}/pkgconfig/sane-backends.pc
|
%{_libdir}/pkgconfig/sane-backends.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 05 2007 Nils Philippsen <nphilipp@redhat.com> - 1.0.18-8
|
||||||
|
- tweak udev rules to conform with new udev syntax (#246849)
|
||||||
|
|
||||||
* Fri Jun 15 2007 Nils Philippsen <nphilipp@redhat.com> - 1.0.18-7
|
* Fri Jun 15 2007 Nils Philippsen <nphilipp@redhat.com> - 1.0.18-7
|
||||||
- call usb_reset() prior to usb_close() to workaround hanging USB hardware
|
- call usb_reset() prior to usb_close() to workaround hanging USB hardware
|
||||||
(#149027, #186766)
|
(#149027, #186766)
|
||||||
|
Loading…
Reference in New Issue
Block a user