pool/sane-backends
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 778823 from graphics

Browse Source 
- Move udev rules from /etc/udev/ to /usr/udev.
- Package libsane1 library as a separate package. This avoids
  pulling in the backends just a application links to it.
- Hide the backends from automatic Provides generation, as these
  all have a libsane.so SONAME.
- Update to 1.0.29:
  * Backends
    + adds an escl backend (theoretically supporting all AirPrint
      devices with a scan unit)
    + adds support for 23 new scanner models via existing backends
    + significantly changes genesys and pixma backends
    + fixes bugs in canon_dr, fujitsu, hp3900, mustek_usb2,
      plustek and xerox_mfp backends
    + fixes all compiler warnings on Debian 10 (#120)
    + fixes portability issues for uClibc-ng and MacOS builds
    + adds support to record and replay USB I/O traffic
    + adds timestamps to debug logs
  * Frontends
    + fixes a 32-bit arithmetic overflow issue in scanimage
  * Documentation
    + updates translations for British English, Catalan, German,
      Ukrainian, Valencian
    + adds scangearmp2 external backend descriptions
    + updates hpaio and utsushi external backend descriptions
    + adds the ChangeLogs/ directory to the source tarball (#103)
  * Build
    + additionally requires libcurl and libxml2 to build the
      escl backend
    + requires libxml2 for USB I/O recording and replay
      functionality
    + re-enables pthread support for backends that use its API
      directly, irrespective of the pthread_t type (#153)
    + moves genesys and pixma backends to a directory of their own
- Update to 1.0.28:
  * Backends
    + adds a ricoh2 backend
    + adds support for 40+ new scanner models
    + significantly changes canon_dr, fujitsu, genesys, gt68xx,
    + hp5590 and, pixma backends
    + fixes bugs in as6e, avision, mustek and plustek backends
    + fixes scores of compiler warnings
  * Frontends
    + adds, changes and removes options for saned (see man 8 saned
      for details)
      - adds: -l (listen), -D (daemonize), -o (once),
        -e (stderr), -u (user)
      - removes: -s (syslog). Use -a -d level -o -f for the
        old behavior
      - changes: -d (debug). Use -a -d level -o -f -e for the
        old behavior
    + saned now cancels scans if the data connections appears to
      have gone away (after 4 seconds by default, configurable in
      saned.conf)
    + adds --output-file option to scanimage
    + adds --help option to scan-find-scanner
    + changes sane-desc to create relative hyperlinks
  * Documentation
    + adds translations for Catalan, Hebrew and Valencian
    + updates translations for British English, Dutch, German and
    + Ukrainian
    + marks unmaintained backends as such
    + documents USB workaround in sane-usb manual page
  * Build
    + requires a C++11 compatible compiler for the genesys backend
    + requires a JPEG library when building the pixma backend
    + fixes unneeded linking when not using preloadable backend
      support
    + disables pthread support for systems with non-integral
      pthread_t type
    + normalizes trailing whitespace in source code files. If you
      have local patches that no longer apply, have a look at the
      whitespace ignoring options of patch and git apply.
- Rebased patches:
  * sane-backends.builttime.patch
- Dropped patches:
  * no-descriptions-external-hpoj.patch

OBS-URL: https://build.opensuse.org/request/show/778823
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sane-backends?expand=0&rev=88
This commit is contained in:
Dominique Leuenberger 2020-02-29 20:18:18 +00:00 committed by Git OBS Bridge
commit c01b5330e6
7 changed files with 175 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
baselibs.conf
View File

@ -1,2 +1,3 @@
libsane1
sane-backends sane-backends
sane-backends-devel sane-backends-devel

10
no-descriptions-external-hpoj.patch
View File

@ -1,10 +0,0 @@
--- doc/Makefile.am.orig 2010-04-05 15:18:05.000000000 +0200
+++ doc/Makefile.am 2010-05-07 12:38:51.000000000 +0200
@@ -202,7 +202,6 @@ DESC_EXT_FILES = descriptions-external/b
descriptions-external/hp3770.desc \
descriptions-external/hp8200.desc \
descriptions-external/hpaio.desc \
- descriptions-external/hpoj.desc \
descriptions-external/kodak-twain.desc \
descriptions-external/lhii.desc \
descriptions-external/mustek_a3p1.desc \

3
sane-backends-1.0.27.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:293747bf37275c424ebb2c833f8588601a60b2f9653945d5a3194875355e36c9
size 6430188

3
sane-backends-1.0.29.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aa027b4e5f59849cd41b8c26d54584cf31fffd986049019be6ad4140e11ea8ed
size 7201950

21
sane-backends.builttime.patch
View File

@ -1,14 +1,20 @@
From 8d9536a24cb7f4a21fb35326819b292e8f87fc20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Thu, 20 Feb 2020 18:46:48 +0100
Subject: [PATCH] Make timestamps reproducible
https://gitlab.com/sane-project/backends/issues/228
--- ---
tools/sane-desc.c | 24 ++++++++++++------------ tools/sane-desc.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-) 1 file changed, 12 insertions(+), 12 deletions(-)
Index: sane-backends-1.0.25/tools/sane-desc.c diff --git a/tools/sane-desc.c b/tools/sane-desc.c
=================================================================== index 890e754..ba85e84 100644
--- sane-backends-1.0.25.orig/tools/sane-desc.c --- a/tools/sane-desc.c
+++ sane-backends-1.0.25/tools/sane-desc.c +++ b/tools/sane-desc.c
@@ -2816,8 +2816,8 @@ html_print_footer (void) @@ -2816,8 +2816,8 @@ html_print_footer (void)
"<address>\n" "<address>\n"
"<a href=\"http://www.sane-project.org/imprint.html\"\n" "<a href=\"imprint.html\"\n"
">Contact</a>\n" "</address>\n" "<font size=-1>\n"); ">Contact</a>\n" "</address>\n" "<font size=-1>\n");
- printf ("This page was last updated on %s by sane-desc %s from %s\n", - printf ("This page was last updated on %s by sane-desc %s from %s\n",
- asctime (localtime (&current_time)), SANE_DESC_VERSION, PACKAGE_STRING); - asctime (localtime (&current_time)), SANE_DESC_VERSION, PACKAGE_STRING);
@ -74,3 +80,6 @@ Index: sane-backends-1.0.25/tools/sane-desc.c
printf printf
("#\n" ("#\n"
--
2.25.1

84
sane-backends.changes
View File

@ -1,3 +1,87 @@
-------------------------------------------------------------------
Thu Feb 20 20:00:43 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Move udev rules from /etc/udev/ to /usr/udev.
- Package libsane1 library as a separate package. This avoids
pulling in the backends just a application links to it.
- Hide the backends from automatic Provides generation, as these
all have a libsane.so SONAME.
-------------------------------------------------------------------
Thu Feb 20 16:34:26 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Update to 1.0.29:
* Backends
+ adds an escl backend (theoretically supporting all AirPrint
devices with a scan unit)
+ adds support for 23 new scanner models via existing backends
+ significantly changes genesys and pixma backends
+ fixes bugs in canon_dr, fujitsu, hp3900, mustek_usb2,
plustek and xerox_mfp backends
+ fixes all compiler warnings on Debian 10 (#120)
+ fixes portability issues for uClibc-ng and MacOS builds
+ adds support to record and replay USB I/O traffic
+ adds timestamps to debug logs
* Frontends
+ fixes a 32-bit arithmetic overflow issue in scanimage
* Documentation
+ updates translations for British English, Catalan, German,
Ukrainian, Valencian
+ adds scangearmp2 external backend descriptions
+ updates hpaio and utsushi external backend descriptions
+ adds the ChangeLogs/ directory to the source tarball (#103)
* Build
+ additionally requires libcurl and libxml2 to build the
escl backend
+ requires libxml2 for USB I/O recording and replay
functionality
+ re-enables pthread support for backends that use its API
directly, irrespective of the pthread_t type (#153)
+ moves genesys and pixma backends to a directory of their own
- Update to 1.0.28:
* Backends
+ adds a ricoh2 backend
+ adds support for 40+ new scanner models
+ significantly changes canon_dr, fujitsu, genesys, gt68xx,
+ hp5590 and, pixma backends
+ fixes bugs in as6e, avision, mustek and plustek backends
+ fixes scores of compiler warnings
* Frontends
+ adds, changes and removes options for saned (see man 8 saned
for details)
- adds: -l (listen), -D (daemonize), -o (once),
-e (stderr), -u (user)
- removes: -s (syslog). Use -a -d level -o -f for the
old behavior
- changes: -d (debug). Use -a -d level -o -f -e for the
old behavior
+ saned now cancels scans if the data connections appears to
have gone away (after 4 seconds by default, configurable in
saned.conf)
+ adds --output-file option to scanimage
+ adds --help option to scan-find-scanner
+ changes sane-desc to create relative hyperlinks
* Documentation
+ adds translations for Catalan, Hebrew and Valencian
+ updates translations for British English, Dutch, German and
+ Ukrainian
+ marks unmaintained backends as such
+ documents USB workaround in sane-usb manual page
* Build
+ requires a C++11 compatible compiler for the genesys backend
+ requires a JPEG library when building the pixma backend
+ fixes unneeded linking when not using preloadable backend
support
+ disables pthread support for systems with non-integral
pthread_t type
+ normalizes trailing whitespace in source code files. If you
have local patches that no longer apply, have a look at the
whitespace ignoring options of patch and git apply.
- Rebased patches:
* sane-backends.builttime.patch
- Dropped patches:
* no-descriptions-external-hpoj.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 12 12:02:07 CEST 2018 - jsmeix@suse.de Thu Apr 12 12:02:07 CEST 2018 - jsmeix@suse.de

138
sane-backends.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package sane-backends # spec file for package sane-backends
# #
# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2020 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,39 +12,47 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
# Enable support for PWG eSCL network backend
%bcond_without escl
Name: sane-backends Name: sane-backends
BuildRequires: gcc-c++
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
BuildRequires: libtool
# Cf. the comment about 'libusb' at .configure below: # Cf. the comment about 'libusb' at .configure below:
BuildRequires: libusb-1_0-devel
BuildRequires: libv4l-devel BuildRequires: libv4l-devel
BuildRequires: net-snmp-devel BuildRequires: net-snmp-devel
BuildRequires: pkg-config BuildRequires: pkgconfig
%if %{with escl}
BuildRequires: pkgconfig(avahi-client) >= 0.6.24
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libxml-2.0)
%endif
BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: pkgconfig(systemd)
%systemd_requires %systemd_requires
%define libname libsane1
# SANE build systems mangles backend SONAMEs to be libsane.so.x
%define __provides_exclude_from %{_libdir}/sane
Summary: SANE (Scanner Access Now Easy) Scanner Drivers Summary: SANE (Scanner Access Now Easy) Scanner Drivers
License: GPL-2.0+ and SUSE-GPL-2.0+-with-sane-exception and SUSE-Public-Domain License: GPL-2.0-or-later AND SUSE-GPL-2.0+-with-sane-exception AND SUSE-Public-Domain
Group: Hardware/Scanner Group: Hardware/Scanner
# There is no 1.0.26 release of sane-backends. That number was skipped so that the SANE upstream Version: 1.0.29
# development version numbers would more clearly be an extension of the prior release:
Version: 1.0.27
Release: 0 Release: 0
Url: http://www.sane-project.org/ URL: http://www.sane-project.org/
# URLs to get Source0: # Unfortunately, the first version does not build, as it does not contain a prebuilt configure,
# On http://www.sane-project.org/source.html at "Stable Source" there is the link to "alioth.debian.org" # and autoconf fails as it requires a complete git clone:
# that points to http://alioth.debian.org/project/showfiles.php?group_id=30186 and there: # https://gitlab.com/sane-project/backends/issues/248
# How to get Source0: # Use the version including a semi-random hash instead, which is a dist tarball
# wget --no-check-certificate https://alioth.debian.org/frs/download.php/file/4224/sane-backends-1.0.27.tar.gz # Source0: https://gitlab.com/sane-project/backends/-/archive/%%{version}/backends-%%{version}.tar.gz#/sane-backends-%%{version}.tar.gz
# How to get the MD5 sum file: Source0: https://gitlab.com/sane-project/backends/uploads/54f858b20a364fc35d820df935a86478/sane-backends-1.0.29.tar.gz
# wget --no-check-certificate https://alioth.debian.org/frs/download.php/file/4223/sane-backends-1.0.27.tar.gz.md5
# How to check the MD5 sum:
# md5sum -c sane-backends-1.0.27.tar.gz.md5
Source0: https://alioth.debian.org/frs/download.php/file/4224/sane-backends-%{version}.tar.gz
# Source100... is SUSE specific stuff: # Source100... is SUSE specific stuff:
# Source102 is the OpenSLP registration file for the saned: # Source102 is the OpenSLP registration file for the saned:
Source102: sane.reg Source102: sane.reg
@ -69,12 +77,9 @@ Source201: create_sane-backends-autoconfig.rules
# Sources 202 and 203 are files to enable socket based service activation which replaced xinetd # Sources 202 and 203 are files to enable socket based service activation which replaced xinetd
Source202: saned@.service Source202: saned@.service
Source203: saned.socket Source203: saned.socket
# Patch2 sane-backends.builttime.patch avoids build-compare noise # PATCH-FIX-OPENSUSE - Make timestamps reproducible, https://gitlab.com/sane-project/backends/issues/228
Patch2: sane-backends.builttime.patch Patch2: sane-backends.builttime.patch
# Patch100... is SUSE specific stuff: # Patch100... is SUSE specific stuff:
# Patch101 no-descriptions-external-hpoj.patch removes descriptions-external/hpoj.desc from doc/Makefile.am
# because it is intentionally removed from the sources in the prep section:
Patch101: no-descriptions-external-hpoj.patch
# Patch102 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner # Patch102 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner
# (see https://bugzilla.novell.com/show_bug.cgi?id=788756#c14). # (see https://bugzilla.novell.com/show_bug.cgi?id=788756#c14).
# It adds "requires DFSG non-free Image Scan software from Avasys" to all comments # It adds "requires DFSG non-free Image Scan software from Avasys" to all comments
@ -86,10 +91,6 @@ Patch101: no-descriptions-external-hpoj.patch
# Furthermore it removes "unsupported" models from epkowa.desc because # Furthermore it removes "unsupported" models from epkowa.desc because
# otherwise there would be confusing model entries shown in yast2-scanner: # otherwise there would be confusing model entries shown in yast2-scanner:
Patch102: adapt_epkowa.desc_for_yast2-scanner.patch Patch102: adapt_epkowa.desc_for_yast2-scanner.patch
# Install into this non-root directory (required when norootforbuild is used):
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Prerequire /sbin/ldconfig which is used in the traditional bash scriptlets for post/postun:
PreReq: /sbin/ldconfig
# See https://bugzilla.novell.com/show_bug.cgi?id=437293 # See https://bugzilla.novell.com/show_bug.cgi?id=437293
%ifarch ppc64 %ifarch ppc64
Obsoletes: sane-64bit Obsoletes: sane-64bit
@ -100,8 +101,8 @@ Obsoletes: sane-64bit
# to avoid a RPMLINT warning that the package obsoletes itself: # to avoid a RPMLINT warning that the package obsoletes itself:
Provides: sane = %{version} Provides: sane = %{version}
Obsoletes: sane < %{version} Obsoletes: sane < %{version}
# Skip testing devel dependencies required by libtool .la files by the following comment: # Pull in the same version, not just matching soname
# skip-check-libtool-deps Requires: %{libname} = %{version}
%description %description
The software consists of SANE scanner drivers, The software consists of SANE scanner drivers,
@ -119,26 +120,36 @@ via network from client hosts that run the "net" meta driver.
%package devel %package devel
Summary: Development files for sane-backends Summary: Development files for sane-backends
License: GPL-2.0+ and SUSE-GPL-2.0+-with-sane-exception and SUSE-Public-Domain License: GPL-2.0-or-later AND SUSE-GPL-2.0+-with-sane-exception AND SUSE-Public-Domain
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name} = %{version} Requires: %{libname} = %{version}
Requires: net-snmp-devel
%description devel %description devel
This package contains the development files for sane-backends. This package contains the development files for sane-backends.
%package -n %{libname}
Summary: Core SANE library
License: GPL-2.0-or-later AND LGPL-2.1-or-later AND SUSE-Public-Domain
Group: Hardware/Scanner
Conflicts: sane-backends < %{version}
Recommends: sane-backends
%description -n %{libname}
This contains the SANE library. Individual scanner backends are provided
by sane-backends or third party packages.
%package autoconfig %package autoconfig
Summary: USB Scanner Autoconfiguration Summary: USB Scanner Autoconfiguration
License: GPL-2.0+ and LGPL-2.1+ and SUSE-Public-Domain License: GPL-2.0-or-later AND LGPL-2.1-or-later AND SUSE-Public-Domain
Group: Hardware/Scanner Group: Hardware/Scanner
Requires: sane-backends Requires: %{libname} = %{version}
# When sane-backends is already installed, try to install also sane-backends-autoconfig if available: # When sane-backends is already installed, try to install also sane-backends-autoconfig if available:
Supplements: sane-backends Supplements: sane-backends
%description autoconfig %description autoconfig
USB scanner autoconfiguration happens via udev. USB scanner autoconfiguration happens via udev.
The file /etc/udev/rules.d/56-sane-backends-autoconfig.rules contains The file /udev/rules.d/56-sane-backends-autoconfig.rules contains
entries for those USB scanners where the USB IDs are known, which are entries for those USB scanners where the USB IDs are known, which are
supported by a free driver, where the support status is "complete" or supported by a free driver, where the support status is "complete" or
"good", and which do not require firmware upload. "good", and which do not require firmware upload.
@ -162,16 +173,15 @@ package or remove it when it is already installed.
# Patch2 sane-backends.builttime.patch avoids build-compare noise # Patch2 sane-backends.builttime.patch avoids build-compare noise
%patch2 -p1 %patch2 -p1
# Patch100... is SUSE specific stuff: # Patch100... is SUSE specific stuff:
# Patch101 no-descriptions-external-hpoj.patch removes descriptions-external/hpoj.desc from doc/Makefile.am
# because it is intentionally removed from the sources in the prep section:
%patch101
# Patch102 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner # Patch102 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner
# see https://bugzilla.novell.com/show_bug.cgi?id=788756#c14 # see https://bugzilla.novell.com/show_bug.cgi?id=788756#c14
%patch102 %patch102
# Source100... is SUSE specific stuff:
# Remove hpoj.desc completely to avoid confusion with its successor hpaio.desc # Remove hpoj.desc completely to avoid confusion with its successor hpaio.desc
# because since openSUSE 10.3 the package hp-officeJet (for hpoj.desc) is dropped. # because since openSUSE 10.3 the package hp-officeJet (for hpoj.desc) is dropped.
sed -i -e '/descriptions-external\/hpoj.desc / d' doc/Makefile{.am,.in}
rm doc/descriptions-external/hpoj.desc rm doc/descriptions-external/hpoj.desc
# For compliance with the other description files in the sane-backends sources # For compliance with the other description files in the sane-backends sources
# change the manufacturer name from "Hewlett Packard" to "Hewlett-Packard": # change the manufacturer name from "Hewlett Packard" to "Hewlett-Packard":
for d in doc/descriptions-external/hp3770.desc doc/descriptions-external/hp8200.desc for d in doc/descriptions-external/hp3770.desc doc/descriptions-external/hp8200.desc
@ -187,18 +197,7 @@ cp %{SOURCE200} create_scanner_database
chmod u+x create_scanner_database chmod u+x create_scanner_database
%build %build
%{?suse_update_config:%{suse_update_config -f}} export CFLAGS="%{optflags} -D_GNU_SOURCE -DGIMP_ENABLE_COMPAT_CRUFT=1 -fno-strict-aliasing"
# 'autoreconf -fi' failed for sane-backends-1.0.19 with the message:
# "aclocal: acinclude.m4:606: file m4/libtool.m4 does not exist".
# The m4 dir from CVS was not included in the 1.0.18 tar, so it was
# not included in 1.0.19 either, but it has new files since 1.0.18.
# It is a bit strange because autoconf never complained before.
# Because it is not clear whether or not 'autoreconf -fi' is best
# and because it builds without it, it was simply disabled for sane-backends-1.0.19.
# Now sane-backends-1.0.20 provides a new automake compatible build system
# so that 'autoreconf -fi' works again:
autoreconf -fi
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DGIMP_ENABLE_COMPAT_CRUFT=1 -fno-strict-aliasing"
export LDFLAGS="-L/%_lib $LDFLAGS" export LDFLAGS="-L/%_lib $LDFLAGS"
# Enable pthread instead of fork (used in Debian since Feb 2009 and no issues so far), # Enable pthread instead of fork (used in Debian since Feb 2009 and no issues so far),
# see https://bugzilla.novell.com/show_bug.cgi?id=633780 # see https://bugzilla.novell.com/show_bug.cgi?id=633780
@ -227,6 +226,9 @@ export LDFLAGS="-L/%_lib $LDFLAGS"
--docdir=%{_defaultdocdir}/sane-backends \ --docdir=%{_defaultdocdir}/sane-backends \
--enable-pthread \ --enable-pthread \
--with-usb \ --with-usb \
%if %{with escl}
--enable-avahi \
%endif
--without-api-spec \ --without-api-spec \
--disable-locking --disable-locking
# Enable locking for backends where "99" is the group of the lockfile path (LOCKPATH_GROUP) # Enable locking for backends where "99" is the group of the lockfile path (LOCKPATH_GROUP)
@ -236,10 +238,10 @@ export LDFLAGS="-L/%_lib $LDFLAGS"
# --enable-locking \ # --enable-locking \
# --with-group=99 \ # --with-group=99 \
# --localstatedir=/var # --localstatedir=/var
make %make_build
%install %install
make install DESTDIR=%{buildroot} %makeinstall
# The actual driver modules are installed as libsane-<driver>.so.{version} # The actual driver modules are installed as libsane-<driver>.so.{version}
# and two libsane-<driver>.so.1 and libsane-<driver>.so links point to them. # and two libsane-<driver>.so.1 and libsane-<driver>.so links point to them.
# Additionally a libsane-<driver>.la libtool archive file is installed # Additionally a libsane-<driver>.la libtool archive file is installed
@ -342,8 +344,8 @@ sed -i -e 's|/usr/share/sane/descriptions|%{buildroot}/usr/share/sane/descriptio
# (use it as bash input because sources may be installed without execute permissions): # (use it as bash input because sources may be installed without execute permissions):
bash %{SOURCE201} >autoconfig.rules bash %{SOURCE201} >autoconfig.rules
# Install the scanner autoconfiguration udev rules file: # Install the scanner autoconfiguration udev rules file:
install -d %{buildroot}%{_sysconfdir}/udev/rules.d install -d %{buildroot}%{_udevrulesdir}
install -m644 autoconfig.rules %{buildroot}%{_sysconfdir}/udev/rules.d/56-sane-backends-autoconfig.rules install -m644 autoconfig.rules %{buildroot}%{_udevrulesdir}/56-sane-backends-autoconfig.rules
# Since version 1.0.19 there is udev and HAL support. # Since version 1.0.19 there is udev and HAL support.
# Therefore the old/outdated hotplug stuff is dropped (was never used by openSUSE). # Therefore the old/outdated hotplug stuff is dropped (was never used by openSUSE).
# Neither tools/hotplug/libsane.usermap nor tools/hotplug/libusbscanner is installed. # Neither tools/hotplug/libsane.usermap nor tools/hotplug/libusbscanner is installed.
@ -414,7 +416,7 @@ sed -i -e '/^# Epson Perfection 636S /i# Epson Perfection 1640\nKERNEL=="sg[0-9]
# see http://lists.alioth.debian.org/pipermail/sane-devel/2011-June/028739.html # see http://lists.alioth.debian.org/pipermail/sane-devel/2011-June/028739.html
sed -i -e '/^# Epson Perfection 2450 /i# Any SCSI processor EPSON SCANNER...\nKERNEL=="sg[0-9]*", ATTRS{type}=="3", ATTRS{vendor}=="EPSON", ATTRS{model}=="SCANNER*", MODE="0664", GROUP="lp", ENV{libsane_matched}="yes"' tools/udev/libsane.rules sed -i -e '/^# Epson Perfection 2450 /i# Any SCSI processor EPSON SCANNER...\nKERNEL=="sg[0-9]*", ATTRS{type}=="3", ATTRS{vendor}=="EPSON", ATTRS{model}=="SCANNER*", MODE="0664", GROUP="lp", ENV{libsane_matched}="yes"' tools/udev/libsane.rules
# Install the udev rules file: # Install the udev rules file:
install -m644 tools/udev/libsane.rules %{buildroot}%{_sysconfdir}/udev/rules.d/55-libsane.rules install -m644 tools/udev/libsane.rules %{buildroot}%{_udevrulesdir}/55-libsane.rules
# Service files: # Service files:
# Sources 202 and 203 are files to enable socket based service activation which replaced xinetd # Sources 202 and 203 are files to enable socket based service activation which replaced xinetd
# Source202 is saned@.service and Source203 is saned.socket # Source202 is saned@.service and Source203 is saned.socket
@ -448,33 +450,32 @@ fi
%service_add_pre saned.socket %service_add_pre saned.socket
%post %post
/sbin/ldconfig
%service_add_post saned.socket %service_add_post saned.socket
%preun %preun
%service_del_preun saned.socket %service_del_preun saned.socket
%postun %postun
/sbin/ldconfig
%service_del_postun saned.socket %service_del_postun saned.socket
%post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig
%files -f sane-backends.lang %files -f sane-backends.lang
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_sysconfdir}/sane.d %dir %{_sysconfdir}/sane.d
%config(noreplace) %{_sysconfdir}/sane.d/*.conf %config(noreplace) %{_sysconfdir}/sane.d/*.conf
%dir %{_sysconfdir}/slp.reg.d %dir %{_sysconfdir}/slp.reg.d
%config(noreplace) %{_sysconfdir}/slp.reg.d/* %config(noreplace) %{_sysconfdir}/slp.reg.d/*
%dir %{_sysconfdir}/udev %{_udevrulesdir}/55-libsane.rules
%dir %{_sysconfdir}/udev/rules.d
%{_sysconfdir}/udev/rules.d/55-libsane.rules
%{_sbindir}/saned %{_sbindir}/saned
%{_bindir}/scanimage %{_bindir}/scanimage
%{_bindir}/sane-find-scanner %{_bindir}/sane-find-scanner
%{_bindir}/gamma4scanimage %{_bindir}/gamma4scanimage
%{_bindir}/umax_pp %{_bindir}/umax_pp
%{_datadir}/sane/ %{_datadir}/sane/
%{_libdir}/libsane.so.*
%{_libdir}/sane/ %{_libdir}/sane/
%exclude %{_libdir}/sane/libsane-dll.so.*
%{_unitdir}/saned@.service %{_unitdir}/saned@.service
%{_unitdir}/saned.socket %{_unitdir}/saned.socket
#dir /var/lock/sane #dir /var/lock/sane
@ -486,6 +487,13 @@ fi
%doc %{_mandir}/man7/sane.7.gz %doc %{_mandir}/man7/sane.7.gz
%doc %{_mandir}/man8/saned.8.gz %doc %{_mandir}/man8/saned.8.gz
%files -n %{libname}
%dir %{_libdir}/sane/
%dir %{_sysconfdir}/sane.d
%dir %{_sysconfdir}/sane.d/dll.d/
%{_libdir}/sane/libsane-dll.so.*
%{_libdir}/libsane.so.*
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/sane-config %{_bindir}/sane-config
@ -496,8 +504,6 @@ fi
%files autoconfig %files autoconfig
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_sysconfdir}/udev %{_udevrulesdir}/56-sane-backends-autoconfig.rules
%dir %{_sysconfdir}/udev/rules.d
%{_sysconfdir}/udev/rules.d/56-sane-backends-autoconfig.rules
%changelog %changelog