From 3169161844796ee0b24e1f80a663e53e721c7bb2 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 10 Oct 2011 13:59:26 +0200 Subject: [PATCH] multilib: let -devel depend on -drivers-* on F-16 and earlier (#740992) --- sane-backends.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/sane-backends.spec b/sane-backends.spec index 7bc3fdb..8ed0e9e 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -1,7 +1,14 @@ +%if !0%{?fedora}%{?rhel} || 0%{?fedora} >= 17 || 0%{?rhel} >= 7 +%global needs_multilib_quirk 0 +%else +# let -devel require drivers to make them available as multilib +%global needs_multilib_quirk 1 +%endif + Summary: Scanner access software Name: sane-backends Version: 1.0.22 -Release: 4%{?dist} +Release: 5%{?dist} # lib/ is LGPLv2+, backends are GPLv2+ with exceptions # Tools are GPLv2+, docs are public domain # see LICENSE for details @@ -65,6 +72,10 @@ Summary: SANE development toolkit Group: Development/Libraries Requires: sane-backends = %{?epoch:%{epoch}:}%{version}-%{release} Requires: sane-backends-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +%if %needs_multilib_quirk +Requires: sane-backends-drivers-scanners%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: sane-backends-drivers-cameras%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +%endif Requires: libusb-devel Requires: libieee1284-devel Requires: libjpeg-devel @@ -190,6 +201,9 @@ rm -rf %{buildroot} %{_libdir}/sane/*gphoto2.so.* %changelog +* Mon Oct 10 2011 Nils Philippsen - 1.0.22-5 +- multilib: let -devel depend on -drivers-* on F-16 and earlier (#740992) + * Fri Sep 16 2011 Nils Philippsen - 1.0.22-4 - multilib: always use pkg-config in sane-config (#707910) - add USB id for Epson Stylus SX125 (#703529)