Accepting request 589780 from graphics

Dropped libieee1284 support which is only needed for some parallel port scanners and fixed installation of systemd unit files (boo#1074054) (forwarded request 589779 from jsmeix)

OBS-URL: https://build.opensuse.org/request/show/589780
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sane-backends?expand=0&rev=86

sane-backends.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Mar 21 16:29:29 CET 2018 - jsmeix@suse.de
+
+- Drop BuildRequires for libieee1284-devel and libieee1284
+  which is only needed for some parallel port scanners
+  but parallel port scanners are no longer supported
+  so that the backends canon_pp, hpsj5s, and mustek_pp
+  are no longer provided.
+- Fixed installation of systemd unit files saned@.service
+  and saned.socket that enable socket based saned activation
+  which replaces xinetd (boo#1074054).
+
 -------------------------------------------------------------------
 Sun Oct 29 10:14:52 UTC 2017 - meissner@suse.com
 
@@ -6,7 +18,9 @@ Sun Oct 29 10:14:52 UTC 2017 - meissner@suse.com
 -------------------------------------------------------------------
 Fri Jun 16 11:42:37 UTC 2017 - nmoudra@suse.com
 
-- Deleted xinetd service in favor of socked based activation
+- Deleted xinetd service in favor of socket based activation
+  via systemd unit files saned@.service and saned.socket
+  see https://build.opensuse.org/request/show/504186
 
 -------------------------------------------------------------------
 Wed May 24 10:02:33 CEST 2017 - jsmeix@suse.de

sane-backends.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package sane-backends
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,11 +17,6 @@
 
 
 Name:           sane-backends
-%if 0%{?suse_version} > 1130
-BuildRequires:  libieee1284-devel
-%else
-BuildRequires:  libieee1284
-%endif
 BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
@@ -33,10 +28,10 @@ BuildRequires:  net-snmp-devel
 BuildRequires:  pkg-config
 %systemd_requires
 Summary:        SANE (Scanner Access Now Easy) Scanner Drivers
-# There is no 1.0.26 release of sane-backends. That number was skipped so that the SANE upstream
-# development version numbers would more clearly be an extension of the prior release:
 License:        GPL-2.0+ and SUSE-GPL-2.0+-with-sane-exception and SUSE-Public-Domain
 Group:          Hardware/Scanner
+# There is no 1.0.26 release of sane-backends. That number was skipped so that the SANE upstream
+# development version numbers would more clearly be an extension of the prior release:
 Version:        1.0.27
 Release:        0
 Url:            http://www.sane-project.org/
@@ -71,7 +66,7 @@ Source200:      create_scanner_database
 # to extract the needed info from which create_sane-backends-autoconfig.rules
 # generates the 56-sane-backends-autoconfig.rules file:
 Source201:      create_sane-backends-autoconfig.rules
-# Sources 202 and 203 are files to enable socked based service activation which replaced xinetd
+# Sources 202 and 203 are files to enable socket based service activation which replaced xinetd
 Source202:      saned@.service
 Source203:      saned.socket
 # Patch2 sane-backends.builttime.patch avoids build-compare noise
@@ -420,9 +415,14 @@ sed -i -e '/^# Epson Perfection 636S /i# Epson Perfection 1640\nKERNEL=="sg[0-9]
 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 -m644 tools/udev/libsane.rules %{buildroot}%{_sysconfdir}/udev/rules.d/55-libsane.rules
-# Service files
+# Service files:
-install -d -m644 %{buildroot}%{_unitdir}/saned@.service
+# Sources 202 and 203 are files to enable socket based service activation which replaced xinetd
-install -d -m644 %{buildroot}%{_unitdir}/saned.socket
+# Source202 is saned@.service and Source203 is saned.socket
+# see https://bugzilla.opensuse.org/show_bug.cgi?id=1074054#c5
+# and https://bugzilla.opensuse.org/attachment.cgi?id=760460
+install -d -m755 %{buildroot}%{_unitdir}
+install -m644 %{SOURCE202} %{buildroot}%{_unitdir}
+install -m644 %{SOURCE203} %{buildroot}%{_unitdir}
 # OpenSLP registration stuff:
 install -d -m755 %{buildroot}%{_sysconfdir}/slp.reg.d
 install -m644 %{SOURCE102} %{buildroot}%{_sysconfdir}/slp.reg.d
@@ -433,6 +433,18 @@ rm %{buildroot}%{_defaultdocdir}/sane-backends/{README.aix,README.beos,README.da
 %find_lang sane-backends
 
 %pre
+if [ $1 = 2 ] ; then
+    # In case of an upgrade the erroneously created as directories saned.socket and saned@.service
+    # must be removed, otherwise the upgrade will fail,
+    # see https://bugzilla.opensuse.org/show_bug.cgi?id=1074054#c5
+    # and https://bugzilla.opensuse.org/attachment.cgi?id=760460
+    if [ -d /usr/lib/systemd/system/saned.socket ] ; then
+        /usr/bin/rmdir /usr/lib/systemd/system/saned.socket
+    fi
+    if [ -d /usr/lib/systemd/system/saned@.service ] ; then
+        /usr/bin/rmdir /usr/lib/systemd/system/saned@.service
+    fi
+fi
 %service_add_pre saned.socket
 
 %post