rpms/libftdi/devel libftdi-0.16-multilib.patch, NONE, 1.1 libftdi.spec, 1.9, 1.10

[Lucian Langa]

Author: lucilanga

Update of /cvs/pkgs/rpms/libftdi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12177

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-5
- fix multilib conflict in libftdi-config (#508498)

libftdi-0.16-multilib.patch:
 libftdi-config.in |   13 +++++--------
 1 file changed, 5 insertions(+), 8 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 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 at includedir@"
-      fi
-      echo_cflags=yes
+      pkg-config --cflags libftdi
       ;;
     --libs)
-      echo_libs=yes
+      pkg-config --libs libftdi
       ;;
     *)
       usage 1 1>&2


Index: libftdi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libftdi/devel/libftdi.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- libftdi.spec	25 Jul 2009 05:38:41 -0000	1.9
+++ libftdi.spec	31 Jul 2009 07:58:46 -0000	1.10
@@ -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 libft
 %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 at gnome.eu.org> - 0.16-5
+- fix multilib conflict in libftdi-config (#508498)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild