Hello community, here is the log from the commit of package sane-backends for openSUSE:Factory checked in at 2017-06-23 09:17:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sane-backends (Old) and /work/SRC/openSUSE:Factory/.sane-backends.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sane-backends" Fri Jun 23 09:17:10 2017 rev:84 rq:504312 version:1.0.27 Changes: -------- --- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes 2017-06-07 09:53:02.314904032 +0200 +++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 2017-06-23 09:17:17.655511335 +0200 @@ -1,0 +2,5 @@ +Fri Jun 16 11:42:37 UTC 2017 - nmou...@suse.com + +- Deleted xinetd service in favor of socked based activation + +------------------------------------------------------------------- Old: ---- sane-port New: ---- saned.socket saned@.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sane-backends.spec ++++++ --- /var/tmp/diff_new_pack.2tzvbJ/_old 2017-06-23 09:17:18.783351971 +0200 +++ /var/tmp/diff_new_pack.2tzvbJ/_new 2017-06-23 09:17:18.783351971 +0200 @@ -31,11 +31,12 @@ BuildRequires: libv4l-devel BuildRequires: net-snmp-devel BuildRequires: pkg-config +%systemd_requires Summary: SANE (Scanner Access Now Easy) Scanner Drivers -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: +License: GPL-2.0+ and SUSE-GPL-2.0+-with-sane-exception and SUSE-Public-Domain +Group: Hardware/Scanner Version: 1.0.27 Release: 0 Url: http://www.sane-project.org/ @@ -50,8 +51,6 @@ # 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: -# Source101 is the xinetd file for the saned: -Source101: sane-port # Source102 is the OpenSLP registration file for the saned: Source102: sane.reg # Source110 creates our hpaio.desc file directly from the models.dat file of HPLIP: @@ -72,6 +71,9 @@ # 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 +Source202: saned@.service +Source203: saned.socket # Patch2 sane-backends.builttime.patch avoids build-compare noise Patch2: sane-backends.builttime.patch # Patch100... is SUSE specific stuff: @@ -418,9 +420,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 -# xinetd stuff: -install -d -m755 %{buildroot}%{_sysconfdir}/xinetd.d/ -install -m644 %{SOURCE101} %{buildroot}%{_sysconfdir}/xinetd.d/ +# Service files +install -d -m644 %{buildroot}%{_unitdir}/saned@.service +install -d -m644 %{buildroot}%{_unitdir}/saned.socket # OpenSLP registration stuff: install -d -m755 %{buildroot}%{_sysconfdir}/slp.reg.d install -m644 %{SOURCE102} %{buildroot}%{_sysconfdir}/slp.reg.d @@ -430,13 +432,19 @@ # https://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros#.25find_lang %find_lang sane-backends +%pre +%service_add_pre saned.socket + %post /sbin/ldconfig -exit 0 +%service_add_post saned.socket + +%preun +%service_del_preun saned.socket %postun /sbin/ldconfig -exit 0 +%service_del_postun saned.socket %files -f sane-backends.lang %defattr(-,root,root) @@ -444,7 +452,6 @@ %config(noreplace) %{_sysconfdir}/sane.d/*.conf %dir %{_sysconfdir}/slp.reg.d %config(noreplace) %{_sysconfdir}/slp.reg.d/* -%config(noreplace) %{_sysconfdir}/xinetd.d/sane-port %dir %{_sysconfdir}/udev %dir %{_sysconfdir}/udev/rules.d %{_sysconfdir}/udev/rules.d/55-libsane.rules @@ -456,6 +463,8 @@ %{_datadir}/sane/ %{_libdir}/libsane.so.* %{_libdir}/sane/ +%{_unitdir}/saned@.service +%{_unitdir}/saned.socket #dir /var/lock/sane %doc %{_defaultdocdir}/sane-backends/ %doc %{_mandir}/man1/scanimage.1.gz ++++++ saned.socket ++++++ [Unit] Description=saned incoming socket [Socket] ListenStream=6566 Accept=yes MaxConnections=1 [Install] WantedBy=sockets.target ++++++ saned@.service ++++++ [Unit] Description=Scanner Service Requires=saned.socket [Service] ExecStart=/usr/sbin/saned User=saned Group=saned StandardInput=null StandardOutput=syslog StandardError=syslog Environment=SANE_CONFIG_DIR=@CONFIGDIR@ # If you need to debug your configuration uncomment the next line and # change it as appropriate to set the desired debug options # Environment=SANE_DEBUG_DLL=255 SANE_DEBUG_NET=255 [Install] Also=saned.socket
