rpms/libftdi/F-13 libftdi-0.17-multilib.patch, NONE, 1.1 libftdi.spec, 1.18, 1.19
Lucian Langa
lucilanga at fedoraproject.org
Wed Jun 9 05:13:54 UTC 2010
Author: lucilanga
Update of /cvs/pkgs/rpms/libftdi/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22424
Modified Files:
libftdi.spec
Added Files:
libftdi-0.17-multilib.patch
Log Message:
fix more multilib issues
libftdi-0.17-multilib.patch:
libftdi-config.in | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
--- NEW FILE libftdi-0.17-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-13/libftdi.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- libftdi.spec 5 May 2010 05:28:58 -0000 1.18
+++ libftdi.spec 9 Jun 2010 05:13:54 -0000 1.19
@@ -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/produk
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 =/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 <cooly at gnome.eu.org> - 0.17-5
+- re-add mistakenly dropped parch (fixes multilib issues)
+
* Wed May 05 2010 Lucian Langa <cooly at gnome.eu.org> - 0.17-4
- fix typo in group handling (#581151)
More information about the scm-commits
mailing list