rpms/libftdi/F-10 libftdi-0.16-multilib.patch, NONE, 1.1 libftdi.spec, 1.5, 1.6

[Lucian Langa]

Author: lucilanga

Update of /cvs/pkgs/rpms/libftdi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1785

Modified Files:
	libftdi.spec 
Added Files:
	libftdi-0.16-multilib.patch 
Log Message:
* Fri Jul 31 2009 Lucian Langa <cooly at gnome.eu.org> - 0.16-3
- fix multilib conflict in libftdi-config

libftdi-0.16-multilib.patch:
 libftdi-config.in |   19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

--- NEW FILE libftdi-0.16-multilib.patch ---
--- 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 at 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 at libdir@ -lftdi @LIBS@
-fi


Index: libftdi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libftdi/F-10/libftdi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libftdi.spec	1 Jul 2009 14:02:14 -0000	1.5
+++ libftdi.spec	31 Jul 2009 12:01:19 -0000	1.6
@@ -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:	2%{?dist}
+Release:	3%{?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
@@ -129,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun c++ -p /sbin/ldconfig
 
 %changelog
+* Fri Jul 31 2009 Lucian Langa <cooly at gnome.eu.org> - 0.16-3
+- fix multilib conflict in libftdi-config
+
 * Wed Jul 01 2009 Lucian Langa <cooly at gnome.eu.org> - 0.16-2
 - added udev rules
 - addedd c++, python bindings