multilib: let -devel depend on -drivers-* on F-16 and earlier (#740992)

This commit is contained in:
Nils Philippsen 2011-10-10 13:59:26 +02:00
parent 8841d4fd2b
commit 3169161844

View File

@ -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 Summary: Scanner access software
Name: sane-backends Name: sane-backends
Version: 1.0.22 Version: 1.0.22
Release: 4%{?dist} Release: 5%{?dist}
# lib/ is LGPLv2+, backends are GPLv2+ with exceptions # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
# Tools are GPLv2+, docs are public domain # Tools are GPLv2+, docs are public domain
# see LICENSE for details # see LICENSE for details
@ -65,6 +72,10 @@ Summary: SANE development toolkit
Group: Development/Libraries Group: Development/Libraries
Requires: sane-backends = %{?epoch:%{epoch}:}%{version}-%{release} Requires: sane-backends = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: sane-backends-libs%{?_isa} = %{?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: libusb-devel
Requires: libieee1284-devel Requires: libieee1284-devel
Requires: libjpeg-devel Requires: libjpeg-devel
@ -190,6 +201,9 @@ rm -rf %{buildroot}
%{_libdir}/sane/*gphoto2.so.* %{_libdir}/sane/*gphoto2.so.*
%changelog %changelog
* Mon Oct 10 2011 Nils Philippsen <nils@redhat.com> - 1.0.22-5
- multilib: let -devel depend on -drivers-* on F-16 and earlier (#740992)
* Fri Sep 16 2011 Nils Philippsen <nils@redhat.com> - 1.0.22-4 * Fri Sep 16 2011 Nils Philippsen <nils@redhat.com> - 1.0.22-4
- multilib: always use pkg-config in sane-config (#707910) - multilib: always use pkg-config in sane-config (#707910)
- add USB id for Epson Stylus SX125 (#703529) - add USB id for Epson Stylus SX125 (#703529)