diff --git a/libusb-config-multilib.patch b/libusb-config-multilib.patch new file mode 100644 index 0000000..4c5ac2e --- /dev/null +++ b/libusb-config-multilib.patch @@ -0,0 +1,25 @@ +Resolve multilib conflict in 'libusb-config' script by removing $libdir variable entirely. + +http://fedoraproject.org/wiki/PackagingDrafts/MultilibTricks#Multiarch.2C_binaries_and_compilation_scripts + +Author: Jan Vcelak +Date: 2011-06-22 + +diff -uNPrp libusb-compat-0.1.3/libusb-config.in libusb-compat-0.1.3.multilib/libusb-config.in +--- libusb-compat-0.1.3/libusb-config.in 2009-06-23 23:45:33.000000000 +0200 ++++ libusb-compat-0.1.3.multilib/libusb-config.in 2011-06-22 09:55:59.810188470 +0200 +@@ -3,7 +3,6 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + includedir=@includedir@ +-libdir=@libdir@ + exec_prefix_set=no + + usage() +@@ -77,5 +76,5 @@ if test "$echo_cflags" = "yes"; then + echo $includes + fi + if test "$echo_libs" = "yes"; then +- echo -L$libdir -lusb ++ echo -lusb + fi diff --git a/libusb.spec b/libusb.spec index dbaea1f..0422cee 100644 --- a/libusb.spec +++ b/libusb.spec @@ -1,7 +1,7 @@ Name: libusb Epoch: 1 Version: 0.1.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A library which allows userspace access to USB devices Group: System Environment/Libraries License: LGPLv2+ @@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: libusb-documentation.patch Patch1: libusb-error-access-log-message.patch +Patch2: libusb-config-multilib.patch BuildRequires: libusb1-devel @@ -43,8 +44,9 @@ this one. %prep %setup -q -n libusb-compat-%{version} -%patch0 -p1 -b documentation -%patch1 -p1 -b error-access-log-message +%patch0 -p1 -b .documentation +%patch1 -p1 -b .error-access-log-message +%patch2 -p1 -b .config-multilib %build %configure --libdir=/%{_lib} @@ -81,6 +83,9 @@ rm -rf %{buildroot} /%{_lib}/libusb.a %changelog +* Wed Jun 22 2011 Jan Vcelak 0.1.3-9 +- resolve multilib conflict in 'libusb-config' script + * Tue Jun 21 2011 Jan Vcelak 0.1.3-8 - add libusb-config into -devel subpackage (#713483)