From 328a3050aa3df28b788e8bd79141cfb2c990b6f4 Mon Sep 17 00:00:00 2001
From: Lucian Langa <lucilanga@fedoraproject.org>
Date: Fri, 31 Jul 2009 07:58:46 +0000
Subject: [PATCH] - fix multilib conflict in libftdi-config (#508498)

---
 libftdi-0.16-multilib.patch | 33 +++++++++++++++++++++++++++++++++
 libftdi.spec                |  7 ++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 libftdi-0.16-multilib.patch

diff --git a/libftdi-0.16-multilib.patch b/libftdi-0.16-multilib.patch
new file mode 100644
index 0000000..0f3d347
--- /dev/null
+++ b/libftdi-0.16-multilib.patch
@@ -0,0 +1,33 @@
+--- libftdi-0.16/libftdi-config.in	2009-02-06 17:40:10.000000000 +0200
++++ libftdi-0.16-mod/libftdi-config.in	2009-07-31 10:39:56.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
diff --git a/libftdi.spec b/libftdi.spec
index 2462582..6819b01 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.16
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Library to program and control the FTDI USB controller
 
 Group:		System Environment/Libraries
@@ -9,6 +9,7 @@ License:	LGPLv2
 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.16-multilib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libusb-devel, doxygen, boost-devel, python-devel, swig
@@ -57,6 +58,7 @@ for building C++ applications with libftdi.
 %prep
 %setup -q
 sed -i -e 's/HTML_FOOTER            =/HTML_FOOTER            = no_date_footer.html/g' doc/Doxyfile.in
+%patch0 -p1 -b .multilib
 
 
 %build
@@ -129,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun c++ -p /sbin/ldconfig
 
 %changelog
+* Fri Jul 31 2009 Lucian Langa <cooly@gnome.eu.org> - 0.16-5
+- fix multilib conflict in libftdi-config (#508498)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.16-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild