Accepting request 253516 from hardware

1

OBS-URL: https://build.opensuse.org/request/show/253516
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libftdi1?expand=0&rev=11

buildfixes.diff

@@ -1,37 +0,0 @@
----
- examples/bitbang.c        |    1 +
- examples/bitbang_cbus.c   |    1 +
- examples/bitbang_ft2232.c |    1 +
- examples/serial_read.c    |    1 +
- 4 files changed, 4 insertions(+)
-
-Index: libftdi-0.20/examples/bitbang.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;
- }

libftdi-0.20.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3176d5b5986438f33f5208e690a8bfe90941be501cc0a72118ce3d338d4b838e
-size 423570

libftdi1-1.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7290fd38208d8c00d25ed13ce172aaa0403b37148080e4a33a99837022d2b321
+size 97072

libftdi1.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Oct 30 16:19:35 UTC 2013 - rw@suse.de
+
+- updated to 1.0
+  * Ported to libusb 1.x (initial work by Jie Zhang)
+  * Many eeprom handling improvements (Uwe Bonnes, Anders Larsen)
+  * Renamed pkconfig, library .so etc. files to "libftdi1" (Intra2net)
+  * ftdi_eeprom is part of libftdi now (Intra2net)
+  * New baudrate calculation code + unit tests (Uwe Bonnes and Intra2net)
+  * Improved python bindings including python3 support (Michel Zou)
+  * Switched completely to cmake build system (Intra2net)
+  * cmake: Easy libftdi discovery via find_package() (Michel Zou)
+  * eeprom handling now done via get()/set() functions (Uwe Bonnes)
+  * C++ wrapper: Fixed use-after-free in List::find_all() (Intra2net)
+  * Documentation updates (Xiaofan Chen)
+  * See the git history for more changes and fixes
+- removed buildfixes.diff
+
 -------------------------------------------------------------------
 Wed Jan  2 22:06:35 UTC 2013 - prusnak@opensuse.org
 

libftdi1.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libftdi1
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -17,16 +17,18 @@
 
 
 Name:           libftdi1
-Version:        0.20
+Version:        1.0
 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:         http://www.intra2net.com/en/developer/libftdi/download/libftdi-%{version}.tar.gz
-Patch0:         buildfixes.diff
+Source:         http://www.intra2net.com/en/developer/libftdi/download/libftdi1-%{version}.tar.bz2
+BuildRequires:  boost-devel
+BuildRequires:  cmake >= 2.8
 BuildRequires:  doxygen
-BuildRequires:  libusb-devel
+BuildRequires:  gcc-c++
+BuildRequires:  libusb-1_0-devel
 BuildRequires:  pkgconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -34,7 +36,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Header files and static libraries for libftdi
 Group:          Development/Libraries/C and C++
 Requires:       libftdi1 = %{version}
-Requires:       libusb-devel
+Requires:       libusb-1_0-devel
 
 %description
 Library to program and control the FTDI USB controller.
@@ -45,31 +47,26 @@ Header files and static libraries for libftdi.
 This library is used by many programs accessing FTDI USB-to-RS232 converters.
 
 %prep
-%setup -q -n libftdi-%{version}
-%patch0 -p1
+%setup -q
+mkdir build
 
 %build
-%configure --disable-dependency-tracking CFLAGS="%{optflags}"
+cd build
+%ifarch ia64
+CMFLAGS="-DLIB_SUFFIX=/"
+%else
+CMFLAGS=""
+%endif
+
+CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" \
+cmake  -DCMAKE_INSTALL_PREFIX="%{_prefix}" $CMFLAGS ../
 make %{?_smp_mflags}
 
 %install
+cd build
 %make_install
 mkdir -p %{buildroot}%{_mandir}/man3
-gzip -9 doc/man/man3/*.3
-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 -rf %{buildroot}
+cp -p doc/man/man3/[^_]*.3 %{buildroot}%{_mandir}/man3
 
 %post -p /sbin/ldconfig
 
@@ -82,11 +79,12 @@ rm -rf %{buildroot}
 
 %files -n libftdi1-devel
 %defattr(-,root,root)
-%{_bindir}/libftdi-config
-%{_includedir}/*.h
-%{_libdir}/libftdi.so
+%{_bindir}/libftdi*-config
+%{_includedir}/%{name}
+%{_libdir}/libftdi*.so
 %{_libdir}/libftdi*.*a
 %{_libdir}/pkgconfig/*.pc
+%{_libdir}/cmake/%{name}
 %{_mandir}/man3/*
 
 %changelog