diff --git a/libftdi-0.17-multilib.patch b/libftdi-0.17-multilib.patch new file mode 100644 index 0000000..ba26fa1 --- /dev/null +++ b/libftdi-0.17-multilib.patch @@ -0,0 +1,44 @@ +--- libftdi-0.16/libftdi-config.in 2009-02-06 17:40:10.000000000 +0200 ++++ libftdi-0.16-mod/libftdi-config.in 2009-07-31 13:08:08.000000000 +0300 +@@ -1,7 +1,7 @@ + #!/bin/sh + +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ ++prefix=`pkg-config --variable prefix libftdi` ++exec_prefix=`pkg-config --variable exec_prefix libftdi` + exec_prefix_set=no + + usage() +@@ -46,17 +46,14 @@ + echo_exec_prefix=yes + ;; + --version) +- echo @VERSION@ ++ pkg-config --modversion libftdi + exit 0 + ;; + --cflags) +- if test "@includedir@" != /usr/include ; then +- includes="-I@includedir@" +- fi +- echo_cflags=yes ++ pkg-config --cflags libftdi + ;; + --libs) +- echo_libs=yes ++ pkg-config --libs libftdi + ;; + *) + usage 1 1>&2 +@@ -71,9 +68,3 @@ + if test "$echo_exec_prefix" = "yes"; then + echo $exec_prefix + fi +-if test "$echo_cflags" = "yes"; then +- echo $includes +-fi +-if test "$echo_libs" = "yes"; then +- echo -L@libdir@ -lftdi @LIBS@ +-fi + diff --git a/libftdi.spec b/libftdi.spec index 3ca96b3..cfb002d 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,7 +1,7 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: libftdi Version: 0.17 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -10,6 +10,7 @@ URL: http://www.intra2net.com/de/produkte/opensource/ftdi/ Source0: http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/%{name}-%{version}.tar.gz Source1: no_date_footer.html Patch0: libftdi-0.17-bind-typo.patch +Patch1: libftdi-0.17-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel, doxygen, boost-devel, python-devel, swig @@ -63,6 +64,7 @@ sed -i -e 's/HTML_FOOTER =/HTML_FOOTER = no_date_footer.ht #kernel does not provide usb_device anymore sed -i -e 's/usb_device/usb/g' packages/99-libftdi.rules %patch0 -p1 -b .bindings-typo +%patch1 -p1 -b .multilib %build @@ -139,6 +141,9 @@ exit 0 %postun c++ -p /sbin/ldconfig %changelog +* Wed Jun 09 2010 Lucian Langa - 0.17-5 +- readd mistakenly dropped parch (fixes multilib issues) + * Wed May 05 2010 Lucian Langa - 0.17-4 - fix typo in group handling (#581151)