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

ship adapted udev rules from F-12 on (#512516) don't require pam anymore

Browse Source
This commit is contained in:
Nils Philippsen 2009-10-22 10:17:45 +00:00
parent 5c8da1246b
commit 18e74b6c8e
3 changed files with 82 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sane-backends-1.0.20-rpath.patch
View File

@ -1,8 +1,8 @@
commit 1249be5ecbd635feeb880b2c60582b34bc04a798
commit fe1456e2431a3b8bd27aadc5bbc6998ebc8cd00c
Author: Nils Philippsen <nils@redhat.com>
Date: Mon Aug 31 16:38:23 2009 +0200
path: rpath
patch: rpath
Squashed commit of the following:

38
sane-backends-1.0.20-udev.patch Normal file
View File

@ -0,0 +1,38 @@
commit 5e153e8354ee1cba5d7cd4a532f671810186a6a1
Author: Nils Philippsen <nils@redhat.com>
Date: Thu Oct 22 11:19:22 2009 +0200
patch: udev
Squashed commit of the following:
commit fe874d6f9873598e8bcd9201508bc2c89365e821
Author: Nils Philippsen <nils@redhat.com>
Date: Thu Oct 22 11:16:16 2009 +0200
adapt generated udev rules for Fedora
diff --git a/tools/sane-desc.c b/tools/sane-desc.c
index c317700..b6638a4 100644
--- a/tools/sane-desc.c
+++ b/tools/sane-desc.c
@@ -3488,7 +3488,7 @@ print_udev (void)
printf ("SUBSYSTEMS!=\"scsi\", GOTO=\"libsane_scsi_rules_end\"\n\n");
printf ("LABEL=\"libsane_scsi_rules_begin\"\n");
printf ("# Generic: SCSI device type 6 indicates a scanner\n");
- printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP);
+ printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", ENV{libsane_matched}=\"yes\"\n");
printf ("# Some scanners advertise themselves as SCSI device type 3\n");
while (scsiid)
@@ -3521,8 +3521,8 @@ print_udev (void)
}
}
printf ("\n");
- printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\n",
- scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVGROUP);
+ printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", ENV{libsane_matched}=\"yes\"\n",
+ scsiid->scsi_vendor_id, scsiid->scsi_product_id);
scsiid = scsiid->next;
}
printf ("LABEL=\"libsane_scsi_rules_end\"\n\n");

48
sane-backends.spec
View File

@ -1,7 +1,21 @@
# Use the following --with/--without <option> switches to control how the
# package will be built:
#
# udev: ship rules for udev (default for Fedora >= 12, RHEL >= 6)
# hal: ship rules for hal (default for Fedora < 12, RHEL < 6)
%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 12 || 0%{?rhel} >= 6
%bcond_without udev
%bcond_with hal
%else
%bcond_with udev
%bcond_without hal
%endif
Summary: Scanner access software
Name: sane-backends
Version: 1.0.20
Release: 7%{?dist}
Release: 8%{?dist}
# lib/ is LGPLv2+, backends are GPLv2+ with exceptions
# Tools are GPLv2+, docs are public domain
# see LICENSE for details
@ -14,8 +28,9 @@ Patch0: sane-backends-1.0.20-rpath.patch
Patch1: sane-backends-1.0.20-pkgconfig.patch
Patch2: sane-backends-1.0.20-open-macro.patch
Patch3: sane-backends-1.0.20-hal.patch
Patch4: sane-backends-1.0.20-man-utf8.patch
Patch5: sane-backends-1.0.20-epson-expression800.patch
Patch4: sane-backends-1.0.20-udev.patch
Patch5: sane-backends-1.0.20-man-utf8.patch
Patch6: sane-backends-1.0.20-epson-expression800.patch
Patch10: sane-backends-1.0.20-autoreconf.patch.bz2
URL: http://www.sane-project.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
@ -26,8 +41,12 @@ BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
BuildRequires: gettext
BuildRequires: gphoto2-devel
Requires: pam >= 0.78-2
%if %{with udev}
Requires: udev >= 143
%endif
%if %{with hal}
Requires: hal >= 0.4.0
%endif
%description
Scanner Access Now Easy (SANE) is a universal scanner interface. The
@ -80,8 +99,9 @@ want to access digital cameras.
%patch1 -p1 -b .pkgconfig
%patch2 -p1 -b .open-macro
%patch3 -p1 -b .hal
%patch4 -p1 -b .man-utf8
%patch5 -p1 -b .epson-expression800
%patch4 -p1 -b .udev
%patch5 -p1 -b .man-utf8
%patch6 -p1 -b .epson-expression800
%patch10 -p1 -b .autoreconf
%build
@ -103,12 +123,19 @@ 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
%if %{with udev}
mkdir -p %{buildroot}/lib/udev/rules.d
install -m 0644 tools/udev/libsane.rules %{buildroot}/lib/udev/rules.d/65-libsane.rules
%endif
%if %{with hal}
mkdir -p %{buildroot}/%{_datadir}/hal/fdi/information/20thirdparty
mkdir -p %{buildroot}/%{_datadir}/hal/fdi/policy/20thirdparty
install -m 0644 tools/hal/libsane.fdi %{buildroot}/%{_datadir}/hal/fdi/information/20thirdparty/19-libsane.fdi
install -m 0644 tools/hal/libsane-policy.fdi %{buildroot}/%{_datadir}/hal/fdi/policy/20thirdparty/19-libsane.fdi
mkdir -p %{buildroot}/%{_libexecdir}
install -m 0755 %{SOURCE2} %{buildroot}/%{_libexecdir}/hal-usb-scanner-add
%endif
%find_lang %name
@ -124,9 +151,14 @@ rm -rf %{buildroot}
%dir /etc/sane.d
%dir /etc/sane.d/dll.d
%config(noreplace) /etc/sane.d/*.conf
%if %{with udev}
/lib/udev/rules.d/65-libsane.rules
%endif
%if %{with hal}
%{_datadir}/hal/fdi/information/20thirdparty/*.fdi
%{_datadir}/hal/fdi/policy/20thirdparty/*.fdi
%{_libexecdir}/hal-usb-scanner-add
%endif
%{_mandir}/*/*
%{_datadir}/pixmaps/sane.png
@ -157,6 +189,10 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/sane-backends.pc
%changelog
* Thu Oct 22 2009 Nils Philippsen <nils@redhat.com> - 1.0.20-8
- ship adapted udev rules from F-12 on (#512516)
- don't require pam anymore
* Fri Aug 31 2009 Nils Philippsen <nils@redhat.com> - 1.0.20-7
- fix --enable-rpath