Accepting request 146855 from home:prusnak:branches:hardware

- updated to 0.20 OBS-URL: https://build.opensuse.org/request/show/146855 OBS-URL: https://build.opensuse.org/package/show/hardware/libftdi1?expand=0&rev=8
2013-01-03 00:13:10 +00:00 · 2013-01-03 00:13:10 +00:00 · fdcc89ff02
commit fdcc89ff02
parent 70c948c044
6 changed files with 77 additions and 83 deletions
--- a/buildfixes.diff
+++ b/buildfixes.diff
@ -5,43 +5,33 @@
 examples/serial_read.c    |    1 +
 4 files changed, 4 insertions(+)

-Index: b/examples/bitbang.c
+Index: libftdi-0.20/examples/bitbang.c
 ===================================================================
--- a/examples/bitbang.c
-+++ b/examples/bitbang.c
-@@ -65,4 +65,5 @@ int main(int argc, char **argv)
- 
-     ftdi_usb_close(&ftdic);
-     ftdi_deinit(&ftdic);
-+    return 0;
- }
-Index: b/examples/bitbang_cbus.c
-===================================================================
--- a/examples/bitbang_cbus.c
-+++ b/examples/bitbang_cbus.c
-@@ -76,4 +76,5 @@ int main(int argc, char **argv)
- 
-     ftdi_usb_close(&ftdic);
-     ftdi_deinit(&ftdic);
-+    return 0;
- }
-Index: b/examples/bitbang_ft2232.c
-===================================================================
--- a/examples/bitbang_ft2232.c
-+++ b/examples/bitbang_ft2232.c
-@@ -86,4 +86,5 @@ int main(int argc, char **argv)
-     ftdi_disable_bitbang(&ftdic2);
-     ftdi_usb_close(&ftdic2);
-     ftdi_deinit(&ftdic2);
-+    return 0;
- }
-Index: b/examples/serial_read.c
-===================================================================
--- a/examples/serial_read.c
-+++ b/examples/serial_read.c
+--- libftdi-0.20.orig/examples/bitbang.c
+++ libftdi-0.20/examples/bitbang.c
@@ -78,4 +78,5 @@ int main(int argc, char **argv)
 
     ftdi_usb_close(&ftdic);
     ftdi_deinit(&ftdic);
 +    return 0;
 }
+Index: libftdi-0.20/examples/bitbang_cbus.c
+===================================================================
+--- libftdi-0.20.orig/examples/bitbang_cbus.c
+++ libftdi-0.20/examples/bitbang_cbus.c
+@@ -84,4 +84,5 @@ int main(void)
+ 
+     ftdi_usb_close(&ftdic);
+     ftdi_deinit(&ftdic);
+    return 0;
+ }
+Index: libftdi-0.20/examples/bitbang_ft2232.c
+===================================================================
+--- libftdi-0.20.orig/examples/bitbang_ft2232.c
+++ libftdi-0.20/examples/bitbang_ft2232.c
+@@ -101,4 +101,5 @@ int main(int argc, char **argv)
+     ftdi_disable_bitbang(&ftdic2);
+     ftdi_usb_close(&ftdic2);
+     ftdi_deinit(&ftdic2);
+    return 0;
+ }
--- a/libftdi-0.18.tar.bz2
+++ b/libftdi-0.18.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4fa1432a1de694073b1f89093bb3ad8ac7523b16814cde1e71a0512a58cda338
-size 313253
--- a/libftdi-0.20.tar.gz
+++ b/libftdi-0.20.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3176d5b5986438f33f5208e690a8bfe90941be501cc0a72118ce3d338d4b838e
+size 423570
--- a/1
+++ b/1
@ -1 +0,0 @@
-addFilter("no-return-in-nonvoid-function .*/serial_read.c")  
--- a/libftdi1.changes
+++ b/libftdi1.changes
@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Jan  2 22:06:35 UTC 2013 - prusnak@opensuse.org
+
+- updated to 0.20
+  * Support for FT232H (Uwe Bonnes)
+  * Fixed install location of header files (Uwe Bonnes and Intra2net)
+  * Backported serial_test tool from libftdi 1.x (Uwe Bonnes)
+- updated to 0.19
+  * Make kernel driver detach configurable (Thomas Klose)
+  * Correct ftdi_poll_modem_status() result code (Tom Saunders)
+  * cmake build system improvements (Evgeny Sinelnikov)
+  * Fix uninitialized memory access in async mode (Intra2net)
+  * Support for FT232R eeprom features (Hermann Kraus)
+  * Fix size returned by ftdi_read_data (Hermann Kraus)
+  * C++ wrapper: Fix infinite recursion in set_bitmode (Intra2net)
+  * Improvements to the python wrapper (Flynn Marquardt and Chris Zeh)
+
 -------------------------------------------------------------------
 Thu May  3 16:21:44 UTC 2012 - cfarrell@suse.com

--- a/libftdi1.spec
+++ b/libftdi1.spec
@ -1,7 +1,7 @@
 #
 # spec file for package libftdi1
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -16,28 +16,25 @@
 #


-%define    enable_async_mode 0
-
-Summary:        Library to program and control the FTDI USB controller
-
 Name:           libftdi1
-Version:        0.18
-Release:        1
+Version:        0.20
+Release:        0
+Summary:        Library to program and control the FTDI USB controller
 License:        LGPL-2.1+ and GPL-2.0-with-classpath-exception
 Group:          Hardware/Other
 Url:            http://www.intra2net.com/en/developer/libftdi
-Source:         libftdi-%{version}.tar.bz2
-Source100:      %{name}-rpmlintrc
+Source:         http://www.intra2net.com/en/developer/libftdi/download/libftdi-%{version}.tar.gz
 Patch0:         buildfixes.diff
+BuildRequires:  doxygen
+BuildRequires:  libusb-devel
+BuildRequires:  pkgconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-AutoReqProv:    libusb
-BuildRequires:  doxygen libusb-devel pkgconfig

 %package -n libftdi1-devel
-License:        LGPL-2.1+ and GPL-2.0-with-classpath-exception
 Summary:        Header files and static libraries for libftdi
 Group:          Development/Libraries/C and C++
-Requires:       libftdi1 = %{version}, libusb-devel
+Requires:       libftdi1 = %{version}
+Requires:       libusb-devel

 %description
 Library to program and control the FTDI USB controller.
@ -52,53 +49,44 @@ This library is used by many programs accessing FTDI USB-to-RS232 converters.
 %patch0 -p1

 %build
-
-%configure --disable-dependency-tracking CFLAGS="$RPM_OPT_FLAGS"
-%if %{enable_async_mode}
-    --with-async-mode \
-%endif
-
-make
+%configure --disable-dependency-tracking CFLAGS="%{optflags}"
+make %{?_smp_mflags}

 %install
-make DESTDIR=$RPM_BUILD_ROOT install
-
-# Cleanup
-rm -f $RPM_BUILD_ROOT/usr/bin/simple
-rm -f $RPM_BUILD_ROOT/usr/bin/bitbang
-rm -f $RPM_BUILD_ROOT/usr/bin/bitbang2
-rm -f $RPM_BUILD_ROOT/usr/bin/bitbang_ft2232
-rm -f $RPM_BUILD_ROOT/usr/bin/bitbang_cbus
-rm -f $RPM_BUILD_ROOT/usr/bin/find_all
-rm -f $RPM_BUILD_ROOT/usr/bin/find_all_pp
-rm -f $RPM_BUILD_ROOT/usr/bin/serial_read
-rm -f $RPM_BUILD_ROOT/usr/bin/baud_test
-
-mkdir -p $RPM_BUILD_ROOT//usr/share/man/man3
+%make_install
+mkdir -p %{buildroot}%{_mandir}/man3
 gzip -9 doc/man/man3/*.3
-cp doc/man/man3/*.3.gz $RPM_BUILD_ROOT//usr/share/man/man3
+cp doc/man/man3/*.3.gz %{buildroot}%{_mandir}/man3
+# Remove example programs
+rm -f %{buildroot}%{_bindir}/simple
+rm -f %{buildroot}%{_bindir}/bitbang
+rm -f %{buildroot}%{_bindir}/bitbang2
+rm -f %{buildroot}%{_bindir}/bitbang_ft2232
+rm -f %{buildroot}%{_bindir}/bitbang_cbus
+rm -f %{buildroot}%{_bindir}/find_all
+rm -f %{buildroot}%{_bindir}/find_all_pp
+rm -f %{buildroot}%{_bindir}/serial_test
+rm -f %{buildroot}%{_bindir}/baud_test

 %clean
-rm -fr $RPM_BUILD_ROOT
+rm -rf %{buildroot}

-%post
-ldconfig
+%post -p /sbin/ldconfig

-%postun
-ldconfig
+%postun -p /sbin/ldconfig

 %files
 %defattr(-,root,root)
+%doc AUTHORS COPYING* LICENSE README
 %{_libdir}/libftdi*.so.*
-%doc COPYING.LIB COPYING.GPL LICENSE

 %files -n libftdi1-devel
 %defattr(-,root,root)
-%doc doc/html
-%{_mandir}/man3/*.3.gz
 %{_bindir}/libftdi-config
-%{_prefix}/include/*.h
+%{_includedir}/*.h
 %{_libdir}/libftdi.so
 %{_libdir}/libftdi*.*a
 %{_libdir}/pkgconfig/*.pc
+%{_mandir}/man3/*
+
 %changelog
				`@ -1 +0,0 @@`
				`addFilter("no-return-in-nonvoid-function .*/serial_read.c")`