[ykpers/f14/master] - build with libusb on s390(x)

Dan Horák sharkcz at fedoraproject.org
Mon Oct 18 13:55:21 UTC 2010


commit 04fb82b73f32559d748ff86fc11c6692a634b32c
Author: Dan Horák <dan at danny.cz>
Date:   Mon Oct 18 15:54:51 2010 +0200

    - build with libusb on s390(x)

 ykpers.spec |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/ykpers.spec b/ykpers.spec
index f45563a..21e6274 100644
--- a/ykpers.spec
+++ b/ykpers.spec
@@ -1,6 +1,6 @@
 Name:           ykpers
 Version:        1.3.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Yubikey personalization program
 
 Group:          Applications/System
@@ -8,7 +8,11 @@ License:        BSD
 URL:            http://code.google.com/p/yubikey-personalization/
 Source0:        http://yubikey-personalization.googlecode.com/files/%{name}-%{version}.tar.gz
 
+%ifnarch s390 s390x
 BuildRequires: libusb1-devel
+%else
+BuildRequires: libusb-devel
+%endif
 BuildRequires: libyubikey-devel
 
 %description
@@ -28,7 +32,12 @@ use ykpers.
 %setup -q
 
 %build
-%configure --disable-static --with-backend=libusb-1.0
+%configure --disable-static \
+%ifnarch s390 s390x
+    --with-backend=libusb-1.0
+%else
+    --with-backend=libusb
+%endif
 # --disable-rpath doesn't work for the configure script
 %{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 %{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -62,6 +71,9 @@ use ykpers.
 %exclude %{_libdir}/libykpers-1.la
 
 %changelog
+* Mon Oct 18 2010 - Dan Horák <dan[at]danny.cz> - 1.3.4-2
+- build with libusb on s390(x)
+
 * Wed Oct 13 2010 - Maxim Burgerhout <maxim at wzzrd.com> - 1.3.4-1
 - Version bump
 


More information about the scm-commits mailing list