[sane-backends] use libusb1 instead of libusb from F-19 on
Nils Philippsen
nphilipp at fedoraproject.org
Fri Apr 19 13:34:04 UTC 2013
commit e2f3b7f28b5e72525135f5644abd1a541fb03db7
Author: Nils Philippsen <nils at redhat.com>
Date: Fri Apr 19 15:33:42 2013 +0200
use libusb1 instead of libusb from F-19 on
sane-backends.spec | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/sane-backends.spec b/sane-backends.spec
index 0ba8750..aa431d5 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -15,13 +15,19 @@
%global udevrulesdir /lib/udev/rules.d
%endif
+%if !0%{?fedora}%{?rhel} || 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+%global libusb1 1
+%else
+%global libusb1 0
+%endif
+
%define __provides_exclude_from ^%{_libdir}/sane/.*\.so.*$
%define __requires_exclude ^libsane-.*\.so\.[0-9]*(\(\).*)?+$
Summary: Scanner access software
Name: sane-backends
Version: 1.0.23
-Release: 8%{?dist}
+Release: 9%{?dist}
# lib/ is LGPLv2+, backends are GPLv2+ with exceptions
# Tools are GPLv2+, docs are public domain
# see LICENSE for details
@@ -49,7 +55,11 @@ Patch6: sane-backends-1.0.23-coolscan-multiscan.patch
URL: http://www.sane-project.org
BuildRequires: %{_bindir}/latex
+%if %libusb1
+BuildRequires: libusb1-devel
+%else
BuildRequires: libusb-devel
+%endif
BuildRequires: libieee1284-devel
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
@@ -91,7 +101,11 @@ Requires: sane-backends-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: sane-backends-drivers-scanners%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: sane-backends-drivers-cameras%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%endif
+%if %libusb1
+Requires: libusb1-devel
+%else
Requires: libusb-devel
+%endif
Requires: libieee1284-devel
Requires: libjpeg-devel
Requires: libtiff-devel
@@ -220,6 +234,9 @@ install -m 0644 tools/sane-backends.pc %{buildroot}%{_libdir}/pkgconfig/
%{_libdir}/sane/*gphoto2.so.*
%changelog
+* Fri Apr 19 2013 Nils Philippsen <nils at redhat.com> - 1.0.23-9
+- use libusb1 instead of libusb from F-19 on
+
* Thu Apr 18 2013 Nils Philippsen <nils at redhat.com> - 1.0.23-8
- fix building with -fno-strict-aliasing
More information about the scm-commits
mailing list