From 919b6c52ecd394850cbd300e4fc38f2a2aa64b25 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 2 Apr 2020 09:13:36 +0200 Subject: [PATCH] remove escl backend - will be merged into sane-airscan in the future, so stop shipping it to prevent escl going into RHEL --- sane-backends.spec | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/sane-backends.spec b/sane-backends.spec index 202662c..aeabe47 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -14,7 +14,7 @@ Summary: Scanner access software Name: sane-backends Version: 1.0.29 -Release: 6%{?dist} +Release: 7%{?dist} # lib/ is LGPLv2+, backends are GPLv2+ with exceptions # Tools are GPLv2+, docs are public domain # see LICENSE for details @@ -65,17 +65,10 @@ BuildRequires: systemd-devel BuildRequires: systemd # needed by macros in rpm scriptlets BuildRequires: systemd-rpm-macros -# for escl backend -BuildRequires: libcurl-devel -BuildRequires: avahi-devel -# for escl backend and USB I/O recording and replay -BuildRequires: libxml2-devel Requires: libpng Requires: systemd >= 196 Requires: systemd-udev >= 196 Requires: sane-backends-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -# needed for escl backend -Requires: avahi-libs %description Scanner Access Now Easy (SANE) is a universal scanner interface. The @@ -174,9 +167,7 @@ LDFLAGS="-pie" %if %libusb1 --with-usb \ %endif - --enable-pthread \ - --enable-avahi \ - --with-libcurl + --enable-pthread make %{?_smp_mflags} # Write udev/hwdb files @@ -335,7 +326,6 @@ exit 0 %{_libdir}/sane/libsane-epson.so %{_libdir}/sane/libsane-epson2.so %{_libdir}/sane/libsane-epsonds.so -%{_libdir}/sane/libsane-escl.so %{_libdir}/sane/libsane-fujitsu.so %{_libdir}/sane/libsane-genesys.so %{_libdir}/sane/libsane-gt68xx.so @@ -424,6 +414,10 @@ exit 0 %{_unitdir}/saned@.service %changelog +* Thu Apr 02 2020 Zdenek Dohnal - 1.0.29-7 +- remove escl backend - will be merged into sane-airscan in the future, so stop shipping it + to prevent escl going into RHEL + * Mon Mar 23 2020 Zdenek Dohnal - 1.0.29-6 - complete fix for #1807751