Hello community, here is the log from the commit of package sane-backends for openSUSE:Factory checked in at 2018-03-24 16:11:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sane-backends (Old) and /work/SRC/openSUSE:Factory/.sane-backends.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sane-backends" Sat Mar 24 16:11:00 2018 rev:86 rq:589780 version:1.0.27 Changes: -------- --- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes 2017-11-01 11:07:53.069617106 +0100 +++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 2018-03-24 16:11:01.304924175 +0100 @@ -1,0 +2,12 @@ +Wed Mar 21 16:29:29 CET 2018 - [email protected] + +- 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 [email protected] + and saned.socket that enable socket based saned activation + which replaces xinetd (boo#1074054). + +------------------------------------------------------------------- @@ -9 +21,3 @@ -- Deleted xinetd service in favor of socked based activation +- Deleted xinetd service in favor of socket based activation + via systemd unit files [email protected] and saned.socket + see https://build.opensuse.org/request/show/504186 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sane-backends.spec ++++++ --- /var/tmp/diff_new_pack.Pyhkfc/_old 2018-03-24 16:11:02.492881351 +0100 +++ /var/tmp/diff_new_pack.Pyhkfc/_new 2018-03-24 16:11:02.500881063 +0100 @@ -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: 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 @@ # 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: [email protected] Source203: saned.socket # Patch2 sane-backends.builttime.patch avoids build-compare noise @@ -420,9 +415,14 @@ 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 -install -d -m644 %{buildroot}%{_unitdir}/[email protected] -install -d -m644 %{buildroot}%{_unitdir}/saned.socket +# Service files: +# Sources 202 and 203 are files to enable socket based service activation which replaced xinetd +# Source202 is [email protected] 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 @@ %find_lang sane-backends %pre +if [ $1 = 2 ] ; then + # In case of an upgrade the erroneously created as directories saned.socket and [email protected] + # 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/[email protected] ] ; then + /usr/bin/rmdir /usr/lib/systemd/system/[email protected] + fi +fi %service_add_pre saned.socket %post
