diff --git a/.cvsignore b/.cvsignore index 53134d2..fc45c97 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libftdi-0.17.tar.gz +libftdi-0.18.tar.gz diff --git a/libftdi-0.17-bind-typo.patch b/libftdi-0.17-bind-typo.patch deleted file mode 100644 index 4f94409..0000000 --- a/libftdi-0.17-bind-typo.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur libftdi-0.17/bindings/python/setup.py.in libftdi-0.17-mod/bindings/python/setup.py.in ---- libftdi-0.17/bindings/python/setup.py.in 2009-05-29 22:54:41.000000000 +0300 -+++ libftdi-0.17-mod/bindings/python/setup.py.in 2010-01-04 09:48:58.000000000 +0200 -@@ -12,6 +12,6 @@ - py_modules=['ftdi'], - ext_modules=[Extension('_ftdi', ['ftdi_wrap.c'], - include_dirs=['@top_srcdir@/src'], -- library_dirs=['@top_buildir@/src/.libs','lib','/usr/lib'], -+ library_dirs=['@top_builddir@/src/.libs','lib','/usr/lib'], - libraries=['ftdi'])], - ) diff --git a/libftdi.spec b/libftdi.spec index c04dda3..418efa9 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 @@ -9,8 +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.17-bind-typo.patch -Patch1: libftdi-0.17-multilib.patch +Patch0: libftdi-0.17-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel, doxygen, boost-devel, python-devel, swig @@ -63,8 +62,7 @@ for building C++ applications with libftdi. sed -i -e 's/HTML_FOOTER =/HTML_FOOTER = no_date_footer.html/g' doc/Doxyfile.in #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 +%patch0 -p1 -b .multilib %build @@ -141,6 +139,10 @@ exit 0 %postun c++ -p /sbin/ldconfig %changelog +* Fri Jul 02 2010 Lucian Langa - 0.17-5 +- drop patch0 fixed upstream +- new upstream release + * Wed Jun 09 2010 Lucian Langa - 0.17-4 - readd mistakenly dropped parch (fixes multilib issues) diff --git a/sources b/sources index 1757dde..21bdf39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -810c69cfaa078b49795c224ef9b6b851 libftdi-0.17.tar.gz +916f65fa68d154621fc0cf1f405f2726 libftdi-0.18.tar.gz