From 0c5260ed78b1f5b7ab3075a49cfec3780398c15d Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Mon, 29 Sep 2008 04:25:05 +0000 Subject: [PATCH 01/79] initial import --- .cvsignore | 1 + libftdi.spec | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 87 insertions(+) create mode 100644 libftdi.spec diff --git a/.cvsignore b/.cvsignore index e69de29..f660d9e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +libftdi-0.14.tar.gz diff --git a/libftdi.spec b/libftdi.spec new file mode 100644 index 0000000..4cc06a6 --- /dev/null +++ b/libftdi.spec @@ -0,0 +1,85 @@ +Name: libftdi +Version: 0.14 +Release: 2%{?dist} +Summary: Library to program and control the FTDI USB controller + +Group: System Environment/Libraries +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 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: libusb-devel, doxygen +Requires: pkgconfig + +%package devel +Summary: Header files and static libraries for libftdi +Group: Development/Libraries +Requires: libftdi = %{version}-%{release} + +%description +A library (using libusb) to talk to FTDI's FT2232C, +FT232BM and FT245BM type chips including the popular bitbang mode. + +%description devel +Header files and static libraries for libftdi + + +%prep +%setup -q + + +%build +%configure +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +find %{buildroot} -name \*\.la -print | xargs rm -f +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 +#no man install +install -p -m 644 doc/man/man3/*.3 $RPM_BUILD_ROOT%{_mandir}/man3 + + +# Cleanup examples +rm -f $RPM_BUILD_ROOT/%{_bindir}/simple +rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang +rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang2 +rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang_ft2232 +rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang_cbus +rm -f $RPM_BUILD_ROOT/%{_bindir}/find_all + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING.LIB README +%{_libdir}/*.so.* + + +%files devel +%defattr(-,root,root,-) +%doc doc/html +%{_bindir}/libftdi-config +%{_libdir}/libftdi.a +%{_libdir}/*.so +%{_includedir}/*.h +%{_libdir}/pkgconfig/*.pc +%{_mandir}/man3/* + + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%changelog +* Fri Sep 26 2008 Lucian Langa - 0.14-2 +- require pkgconfig for devel + +* Tue Sep 23 2008 Lucian Langa - 0.14-1 +- new upstream + +* Wed Sep 03 2008 Lucian Langa - 0.13-1 +- initial specfile diff --git a/sources b/sources index e69de29..40e1089 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +43f20478e725aa5ba6cdae311ca0593d libftdi-0.14.tar.gz From 8fee773a0068d8af24fe2c848b5b2332b646e829 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sun, 15 Feb 2009 09:46:52 +0000 Subject: [PATCH 02/79] - fix for bug #485600: pick libusb-devel for -devel subpackage - new upstream release --- .cvsignore | 2 +- libftdi.spec | 12 ++++++++++-- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index f660d9e..061362a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libftdi-0.14.tar.gz +libftdi-0.15.tar.gz diff --git a/libftdi.spec b/libftdi.spec index 4cc06a6..04549c7 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,6 +1,6 @@ Name: libftdi -Version: 0.14 -Release: 2%{?dist} +Version: 0.15 +Release: 1%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -16,6 +16,7 @@ Requires: pkgconfig Summary: Header files and static libraries for libftdi Group: Development/Libraries Requires: libftdi = %{version}-%{release} +Requires: libusb-devel %description A library (using libusb) to talk to FTDI's FT2232C, @@ -50,6 +51,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang2 rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang_ft2232 rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang_cbus rm -f $RPM_BUILD_ROOT/%{_bindir}/find_all +rm -f $RPM_BUILD_ROOT/%{_bindir}/find_all_pp %clean rm -rf $RPM_BUILD_ROOT @@ -65,8 +67,10 @@ rm -rf $RPM_BUILD_ROOT %doc doc/html %{_bindir}/libftdi-config %{_libdir}/libftdi.a +%{_libdir}/libftdipp.a %{_libdir}/*.so %{_includedir}/*.h +%{_includedir}/*.hpp %{_libdir}/pkgconfig/*.pc %{_mandir}/man3/* @@ -75,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %changelog +* Sun Feb 15 2009 Lucian Langa - 0.15-1 +- fix for bug #485600: pick libusb-devel for -devel subpackage +- new upstream release + * Fri Sep 26 2008 Lucian Langa - 0.14-2 - require pkgconfig for devel diff --git a/sources b/sources index 40e1089..df6396a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -43f20478e725aa5ba6cdae311ca0593d libftdi-0.14.tar.gz +d585c9758cb7085a4448c7c4ece07d8e libftdi-0.15.tar.gz From ef5a0c2b98199fe58afb2e53c9c5d059beafcf2f Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sun, 15 Feb 2009 10:01:57 +0000 Subject: [PATCH 03/79] - add new BR boost-devel --- libftdi.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libftdi.spec b/libftdi.spec index 04549c7..3486268 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,6 +1,6 @@ Name: libftdi Version: 0.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -9,7 +9,7 @@ URL: http://www.intra2net.com/de/produkte/opensource/ftdi/ Source0: http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libusb-devel, doxygen +BuildRequires: libusb-devel, doxygen, boost-devel Requires: pkgconfig %package devel @@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %changelog +* Sun Feb 15 2009 Lucian Langa - 0.15-2 +- add new BR boost-devel + * Sun Feb 15 2009 Lucian Langa - 0.15-1 - fix for bug #485600: pick libusb-devel for -devel subpackage - new upstream release From 787646c131e0cd6e9664ce9c6577f01c8405dcde Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Mon, 16 Feb 2009 13:09:32 +0000 Subject: [PATCH 04/79] - fix tag --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 3486268..2d7a910 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,6 +1,6 @@ Name: libftdi Version: 0.15 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %changelog +* Mon Feb 16 2009 Lucian Langa - 0.15-3 +- fix tag + * Sun Feb 15 2009 Lucian Langa - 0.15-2 - add new BR boost-devel From 3f30e6d1641025cca89f0d93d440150ba97b72ec Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 14:52:58 +0000 Subject: [PATCH 05/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 2d7a910..e44d8e9 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,6 +1,6 @@ Name: libftdi Version: 0.15 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.15-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Feb 16 2009 Lucian Langa - 0.15-3 - fix tag From 4f9be7030b6d3411dda2a01758aa46051c96c5cc Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sat, 9 May 2009 09:44:30 +0000 Subject: [PATCH 06/79] - new upstream release --- libftdi.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libftdi.spec b/libftdi.spec index e44d8e9..f15d638 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,12 +1,13 @@ Name: libftdi -Version: 0.15 -Release: 4%{?dist} +Version: 0.16 +Release: 1%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries 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 +Patch0: libftdi-0.16-python-install.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel, doxygen, boost-devel @@ -28,6 +29,7 @@ Header files and static libraries for libftdi %prep %setup -q +%patch0 -p1 -b .python %build @@ -79,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %changelog +* Fri May 08 2009 Lucian Langa - 0.16-1 +- new upstream release + * Wed Feb 25 2009 Fedora Release Engineering - 0.15-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From b5819939fef4b4cffb9dc6423bc64aa57475e3b6 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sat, 9 May 2009 09:45:23 +0000 Subject: [PATCH 07/79] - new upstream release --- .cvsignore | 2 +- libftdi.spec | 2 -- sources | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 061362a..e7a2966 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libftdi-0.15.tar.gz +libftdi-0.16.tar.gz diff --git a/libftdi.spec b/libftdi.spec index f15d638..fe9f187 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -7,7 +7,6 @@ Group: System Environment/Libraries 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 -Patch0: libftdi-0.16-python-install.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel, doxygen, boost-devel @@ -29,7 +28,6 @@ Header files and static libraries for libftdi %prep %setup -q -%patch0 -p1 -b .python %build diff --git a/sources b/sources index df6396a..d369206 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d585c9758cb7085a4448c7c4ece07d8e libftdi-0.15.tar.gz +524af6f39aefa1a4e8fac12c6be0ed06 libftdi-0.16.tar.gz From 805952e13dd194425b6d262c813762c243ffe729 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Wed, 1 Jul 2009 09:03:17 +0000 Subject: [PATCH 08/79] - added udev rules - addedd c++, python bindings --- libftdi.spec | 77 +++++++++++++++++++++++++++++++++++++++------ no_date_footer.html | 7 +++++ 2 files changed, 74 insertions(+), 10 deletions(-) create mode 100644 no_date_footer.html diff --git a/libftdi.spec b/libftdi.spec index fe9f187..fc6ff30 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,16 +1,18 @@ +%{!?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: 1%{?dist} +Release: 3%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libusb-devel, doxygen, boost-devel -Requires: pkgconfig +BuildRequires: libusb-devel, doxygen, boost-devel, python-devel, swig +Requires: pkgconfig, udev %package devel Summary: Header files and static libraries for libftdi @@ -18,6 +20,22 @@ Group: Development/Libraries Requires: libftdi = %{version}-%{release} Requires: libusb-devel +%package python +Summary: Libftdi library Python binding +Group: Development/Libraries +Requires: libftdi = %{version}-%{release} + +%package c++ +Summary: Libftdi library C++ binding +Group: Development/Libraries +Requires: libftdi = %{version}-%{release} + +%package c++-devel +Summary: Libftdi library C++ binding development headers and libraries +Group: Development/Libraries +Requires: libftdi-devel = %{version}-%{release}, libftdi-c++ = %{version}-%{release} + + %description A library (using libusb) to talk to FTDI's FT2232C, FT232BM and FT245BM type chips including the popular bitbang mode. @@ -25,13 +43,25 @@ FT232BM and FT245BM type chips including the popular bitbang mode. %description devel Header files and static libraries for libftdi +%description python +Libftdi Python Language bindings. + +%description c++ +Libftdi library C++ language binding. + +%description c++-devel +Libftdi library C++ binding development headers and libraries +for building C++ applications with libftdi. + %prep %setup -q +sed -i -e 's/HTML_FOOTER =/HTML_FOOTER = no_date_footer.html/g' doc/Doxyfile.in %build -%configure +%configure --enable-python-binding --enable-libftdipp +cp %{SOURCE1} %{_builddir}/%{name}-%{version}/doc make %{?_smp_mflags} @@ -42,6 +72,8 @@ find %{buildroot} -name \*\.la -print | xargs rm -f mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 #no man install install -p -m 644 doc/man/man3/*.3 $RPM_BUILD_ROOT%{_mandir}/man3 +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d +install -p -m 644 packages/99-libftdi.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d # Cleanup examples @@ -59,26 +91,51 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING.LIB README -%{_libdir}/*.so.* - +%{_libdir}/libftdi.so.* +%config(noreplace) %{_sysconfdir}/udev/rules.d/99-libftdi.rules %files devel %defattr(-,root,root,-) %doc doc/html %{_bindir}/libftdi-config %{_libdir}/libftdi.a -%{_libdir}/libftdipp.a -%{_libdir}/*.so +%{_libdir}/libftdi.so %{_includedir}/*.h -%{_includedir}/*.hpp -%{_libdir}/pkgconfig/*.pc +%{_libdir}/pkgconfig/libftdi.pc %{_mandir}/man3/* +%files python +%defattr(-, root, root, -) +%{python_sitearch}/* + +%files c++ +%defattr(-, root, root, -) +%doc AUTHORS ChangeLog COPYING.LIB README +%{_libdir}/libftdipp.so.* + +%files c++-devel +%defattr(-, root, root, -) +%doc doc/html +%{_libdir}/libftdipp.a +%{_libdir}/libftdipp.so +%{_includedir}/*.hpp +%{_libdir}/pkgconfig/libftdipp.pc + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%post c++ -p /sbin/ldconfig +%postun c++ -p /sbin/ldconfig + %changelog +* Wed Jul 01 2009 Lucian Langa - 0.16-3 +- added udev rules +- addedd c++, python bindings + +* Tue Jun 30 2009 Lucian Langa - 0.16-2 +- fix doxygen conflict (#508498) + * Fri May 08 2009 Lucian Langa - 0.16-1 - new upstream release diff --git a/no_date_footer.html b/no_date_footer.html new file mode 100644 index 0000000..3d46190 --- /dev/null +++ b/no_date_footer.html @@ -0,0 +1,7 @@ +
+Generated for $projectname by doxygen +$doxygenversion
+ + + From 1ee77f010900be4ccdb164c5ae561235ef057cfc Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 05:38:41 +0000 Subject: [PATCH 09/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index fc6ff30..2462582 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.16 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -129,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT %postun c++ -p /sbin/ldconfig %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 0.16-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Jul 01 2009 Lucian Langa - 0.16-3 - added udev rules - addedd c++, python bindings From 328a3050aa3df28b788e8bd79141cfb2c990b6f4 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Fri, 31 Jul 2009 07:58:46 +0000 Subject: [PATCH 10/79] - fix multilib conflict in libftdi-config (#508498) --- libftdi-0.16-multilib.patch | 33 +++++++++++++++++++++++++++++++++ libftdi.spec | 7 ++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 libftdi-0.16-multilib.patch diff --git a/libftdi-0.16-multilib.patch b/libftdi-0.16-multilib.patch new file mode 100644 index 0000000..0f3d347 --- /dev/null +++ b/libftdi-0.16-multilib.patch @@ -0,0 +1,33 @@ +--- 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@includedir@" +- fi +- echo_cflags=yes ++ pkg-config --cflags libftdi + ;; + --libs) +- echo_libs=yes ++ pkg-config --libs libftdi + ;; + *) + usage 1 1>&2 diff --git a/libftdi.spec b/libftdi.spec index 2462582..6819b01 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.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 libftdi. %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 - 0.16-5 +- fix multilib conflict in libftdi-config (#508498) + * Fri Jul 24 2009 Fedora Release Engineering - 0.16-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 51560f9d4cb7009a599938b8cb7176b7d59a88ba Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Fri, 31 Jul 2009 11:04:37 +0000 Subject: [PATCH 11/79] update multilib patch --- libftdi-0.16-multilib.patch | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libftdi-0.16-multilib.patch b/libftdi-0.16-multilib.patch index 0f3d347..de0f468 100644 --- a/libftdi-0.16-multilib.patch +++ b/libftdi-0.16-multilib.patch @@ -1,5 +1,5 @@ --- 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 ++++ libftdi-0.16-mod/libftdi-config.in 2009-07-31 13:08:08.000000000 +0300 @@ -1,7 +1,7 @@ #!/bin/sh @@ -31,3 +31,13 @@ ;; *) 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@libdir@ -lftdi @LIBS@ +-fi From fb98151b4c2b0356352826895df04663749a72df Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Fri, 31 Jul 2009 11:07:54 +0000 Subject: [PATCH 12/79] - rebuilt with modified patch --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 6819b01..b0efc50 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.16 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -131,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT %postun c++ -p /sbin/ldconfig %changelog +* Fri Jul 31 2009 Lucian Langa - 0.16-6 +- rebuilt with modified patch + * Fri Jul 31 2009 Lucian Langa - 0.16-5 - fix multilib conflict in libftdi-config (#508498) From a8b16a0ff11864fd1d25489f89280f8b74b3eb77 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sat, 22 Aug 2009 12:37:53 +0000 Subject: [PATCH 13/79] - add group for udev rule (#517773) --- libftdi.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index b0efc50..722fc15 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.16 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -14,6 +14,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel, doxygen, boost-devel, python-devel, swig Requires: pkgconfig, udev +Requires(pre): shadow-utils + %package devel Summary: Header files and static libraries for libftdi @@ -123,6 +125,8 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/*.hpp %{_libdir}/pkgconfig/libftdipp.pc +%pre +getent group GROUPNAME >/dev/null || groupadd -r plugdev %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -131,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT %postun c++ -p /sbin/ldconfig %changelog +* Sat Aug 22 2009 Lucian Langa - 0.16-7 +- add group for udev rule (#517773) + * Fri Jul 31 2009 Lucian Langa - 0.16-6 - rebuilt with modified patch From a1f6f55c3f62fcb9aa5dbc1639becb757f24bba4 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sat, 22 Aug 2009 13:17:35 +0000 Subject: [PATCH 14/79] - add group for udev rule (#517773) --- libftdi.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libftdi.spec b/libftdi.spec index 722fc15..88f5589 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -127,6 +127,7 @@ rm -rf $RPM_BUILD_ROOT %pre getent group GROUPNAME >/dev/null || groupadd -r plugdev +exit 0 %post -p /sbin/ldconfig %postun -p /sbin/ldconfig From 21005d3010f9ea24db6715f05317a8525739871d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:50:56 +0000 Subject: [PATCH 15/79] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a8fc6d1..087519f 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: libftdi -# $Id$ +# $Id: Makefile,v 1.1 2008/09/28 19:31:58 kevin Exp $ NAME := libftdi SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From fc6a63bdb3cf002380f343472b0d8015ad8ab743 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sun, 20 Dec 2009 18:07:52 +0000 Subject: [PATCH 16/79] new upstream release --- .cvsignore | 2 +- libftdi.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index e7a2966..53134d2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libftdi-0.16.tar.gz +libftdi-0.17.tar.gz diff --git a/libftdi.spec b/libftdi.spec index 88f5589..97dc983 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.16 -Release: 7%{?dist} +Version: 0.17 +Release: 1%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -88,6 +88,8 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang_ft2232 rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang_cbus rm -f $RPM_BUILD_ROOT/%{_bindir}/find_all rm -f $RPM_BUILD_ROOT/%{_bindir}/find_all_pp +rm -f $RPM_BUILD_ROOT/%{_bindir}/baud_test +rm -f $RPM_BUILD_ROOT/%{_bindir}/serial_read %clean rm -rf $RPM_BUILD_ROOT @@ -110,6 +112,7 @@ rm -rf $RPM_BUILD_ROOT %files python %defattr(-, root, root, -) +%doc AUTHORS ChangeLog COPYING.LIB README %{python_sitearch}/* %files c++ @@ -136,6 +139,9 @@ exit 0 %postun c++ -p /sbin/ldconfig %changelog +* Sun Dec 20 2009 Lucian Langa - 0.17-1 +- new upstream release + * Sat Aug 22 2009 Lucian Langa - 0.16-7 - add group for udev rule (#517773) diff --git a/sources b/sources index d369206..1757dde 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -524af6f39aefa1a4e8fac12c6be0ed06 libftdi-0.16.tar.gz +810c69cfaa078b49795c224ef9b6b851 libftdi-0.17.tar.gz From e701a6470ed83c96db760feaaab517c7b0655c07 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Mon, 4 Jan 2010 07:59:08 +0000 Subject: [PATCH 17/79] - add patch to fix typo in python bindings - drop multilib patch0 fixed upstream - new upstream release --- libftdi-0.16-multilib.patch | 43 ------------------------------------ libftdi-0.17-bind-typo.patch | 11 +++++++++ libftdi.spec | 8 ++++--- 3 files changed, 16 insertions(+), 46 deletions(-) delete mode 100644 libftdi-0.16-multilib.patch create mode 100644 libftdi-0.17-bind-typo.patch diff --git a/libftdi-0.16-multilib.patch b/libftdi-0.16-multilib.patch deleted file mode 100644 index de0f468..0000000 --- a/libftdi-0.16-multilib.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- 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@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@libdir@ -lftdi @LIBS@ --fi diff --git a/libftdi-0.17-bind-typo.patch b/libftdi-0.17-bind-typo.patch new file mode 100644 index 0000000..4f94409 --- /dev/null +++ b/libftdi-0.17-bind-typo.patch @@ -0,0 +1,11 @@ +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 97dc983..55093ef 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -9,7 +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 +Patch0: libftdi-0.17-bind-typo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel, doxygen, boost-devel, python-devel, swig @@ -60,7 +60,7 @@ for building C++ applications with libftdi. %prep %setup -q sed -i -e 's/HTML_FOOTER =/HTML_FOOTER = no_date_footer.html/g' doc/Doxyfile.in -%patch0 -p1 -b .multilib +%patch0 -p1 -b .bindings-typo %build @@ -139,7 +139,9 @@ exit 0 %postun c++ -p /sbin/ldconfig %changelog -* Sun Dec 20 2009 Lucian Langa - 0.17-1 +* Sun Jan 01 2010 Lucian Langa - 0.17-1 +- add patch to fix typo in python bindings +- drop multilib patch0 fixed upstream - new upstream release * Sat Aug 22 2009 Lucian Langa - 0.16-7 From 6123b840e46e76db3acf086ff0aa39bb6659ce54 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sat, 16 Jan 2010 15:07:22 +0000 Subject: [PATCH 18/79] do not package static libfiles (#556068) --- libftdi.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libftdi.spec b/libftdi.spec index 55093ef..8fc7c8a 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: 1%{?dist} +Release: 2%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -64,7 +64,7 @@ sed -i -e 's/HTML_FOOTER =/HTML_FOOTER = no_date_footer.ht %build -%configure --enable-python-binding --enable-libftdipp +%configure --enable-python-binding --enable-libftdipp --disable-static cp %{SOURCE1} %{_builddir}/%{name}-%{version}/doc make %{?_smp_mflags} @@ -104,7 +104,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc doc/html %{_bindir}/libftdi-config -%{_libdir}/libftdi.a %{_libdir}/libftdi.so %{_includedir}/*.h %{_libdir}/pkgconfig/libftdi.pc @@ -123,7 +122,6 @@ rm -rf $RPM_BUILD_ROOT %files c++-devel %defattr(-, root, root, -) %doc doc/html -%{_libdir}/libftdipp.a %{_libdir}/libftdipp.so %{_includedir}/*.hpp %{_libdir}/pkgconfig/libftdipp.pc @@ -139,6 +137,9 @@ exit 0 %postun c++ -p /sbin/ldconfig %changelog +* Sat Jan 16 2010 Lucian Langa - 0.17-2 +- do not package static libfiles (#556068) + * Sun Jan 01 2010 Lucian Langa - 0.17-1 - add patch to fix typo in python bindings - drop multilib patch0 fixed upstream From 8e85585fe2eb7d65c3303a49682a330876d4aa5e Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Thu, 11 Mar 2010 19:44:53 +0000 Subject: [PATCH 19/79] fix udev rule --- libftdi.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 8fc7c8a..f9aaa37 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: 2%{?dist} +Release: 3%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -60,6 +60,8 @@ for building C++ applications with libftdi. %prep %setup -q 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 @@ -137,6 +139,9 @@ exit 0 %postun c++ -p /sbin/ldconfig %changelog +* Thu Mar 11 2010 Lucian Langa - 0.17-3 +- fix incorrect UDEV rule (#563566) + * Sat Jan 16 2010 Lucian Langa - 0.17-2 - do not package static libfiles (#556068) From 54956c594af0709406bd5ad4215ec6455c98d290 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Wed, 5 May 2010 05:26:44 +0000 Subject: [PATCH 20/79] fix typo in group handling --- libftdi.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libftdi.spec b/libftdi.spec index f9aaa37..3ca96b3 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: 3%{?dist} +Release: 4%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -129,7 +129,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libftdipp.pc %pre -getent group GROUPNAME >/dev/null || groupadd -r plugdev +getent group plugdev >/dev/null || groupadd -r plugdev exit 0 %post -p /sbin/ldconfig @@ -139,6 +139,9 @@ exit 0 %postun c++ -p /sbin/ldconfig %changelog +* Wed May 05 2010 Lucian Langa - 0.17-4 +- fix typo in group handling (#581151) + * Thu Mar 11 2010 Lucian Langa - 0.17-3 - fix incorrect UDEV rule (#563566) From 8e86cd635d07b87a0e53b8c2a9177a6c6ee3b981 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Wed, 9 Jun 2010 05:44:10 +0000 Subject: [PATCH 21/79] fix more multilib issues --- libftdi-0.17-multilib.patch | 44 +++++++++++++++++++++++++++++++++++++ libftdi.spec | 7 +++++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 libftdi-0.17-multilib.patch diff --git a/libftdi-0.17-multilib.patch b/libftdi-0.17-multilib.patch new file mode 100644 index 0000000..ba26fa1 --- /dev/null +++ b/libftdi-0.17-multilib.patch @@ -0,0 +1,44 @@ +--- 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@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@libdir@ -lftdi @LIBS@ +-fi + diff --git a/libftdi.spec b/libftdi.spec index 3ca96b3..cfb002d 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 @@ -10,6 +10,7 @@ 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 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 =/HTML_FOOTER = no_date_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 - 0.17-5 +- readd mistakenly dropped parch (fixes multilib issues) + * Wed May 05 2010 Lucian Langa - 0.17-4 - fix typo in group handling (#581151) From 185d4466383e14c7300220883988ca6968d04718 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Thu, 1 Jul 2010 17:44:34 +0000 Subject: [PATCH 22/79] new upstream release --- .cvsignore | 2 +- libftdi-0.17-bind-typo.patch | 11 ----------- libftdi.spec | 14 ++++++++------ sources | 2 +- 4 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 libftdi-0.17-bind-typo.patch 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 cfb002d..fbade1d 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: 5%{?dist} +Version: 0.18 +Release: 1%{?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 +* Thu Jul 01 2010 Lucian Langa - 0.18-1 +- drop patch0 - fixed upstream +- new upstream release + * Wed Jun 09 2010 Lucian Langa - 0.17-5 - 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 From 8d838dfcb46a3957770bc21346b76a1832cede8c Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 02:11:39 +0000 Subject: [PATCH 23/79] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index fbade1d..193e606 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.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -139,6 +139,9 @@ exit 0 %postun c++ -p /sbin/ldconfig %changelog +* Wed Jul 21 2010 David Malcolm - 0.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Thu Jul 01 2010 Lucian Langa - 0.18-1 - drop patch0 - fixed upstream - new upstream release From 1c7db0d77223bf5491a0e2d810cef92d6deb569c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 20:57:16 +0000 Subject: [PATCH 24/79] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 087519f..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libftdi -# $Id: Makefile,v 1.1 2008/09/28 19:31:58 kevin Exp $ -NAME := libftdi -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 9a1f1789e408531ebb3829733dce04418a8d94db Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Sun, 1 Aug 2010 16:35:02 +0200 Subject: [PATCH 25/79] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 193e606..db5e778 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.18 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -139,6 +139,9 @@ exit 0 %postun c++ -p /sbin/ldconfig %changelog +* Sun Aug 1 2010 Thomas Spura - 0.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Wed Jul 21 2010 David Malcolm - 0.18-2 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild From 0f28bfb5f5de1d7ad718ba9bbdc57ad559972910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 6 Dec 2010 11:39:50 +0100 Subject: [PATCH 26/79] - fix build with libusb >= 1:0.1.3 (wrapper around libusb1) --- libftdi-0.18-libusb.patch | 526 ++++++++++++++++++++++++++++++++++++++ libftdi.spec | 8 +- 2 files changed, 533 insertions(+), 1 deletion(-) create mode 100644 libftdi-0.18-libusb.patch diff --git a/libftdi-0.18-libusb.patch b/libftdi-0.18-libusb.patch new file mode 100644 index 0000000..8fa5c98 --- /dev/null +++ b/libftdi-0.18-libusb.patch @@ -0,0 +1,526 @@ +diff -up libftdi-0.18/aclocal.m4.libusb libftdi-0.18/aclocal.m4 +--- libftdi-0.18/aclocal.m4.libusb 2010-12-06 11:22:51.207159911 +0100 ++++ libftdi-0.18/aclocal.m4 2010-12-06 11:23:46.692156198 +0100 +@@ -7968,6 +7968,162 @@ m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_D + m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) + m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) + ++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- ++# ++# Copyright © 2004 Scott James Remnant . ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++# PKG_PROG_PKG_CONFIG([MIN-VERSION]) ++# ---------------------------------- ++AC_DEFUN([PKG_PROG_PKG_CONFIG], ++[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) ++m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) ++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=m4_default([$1], [0.9.0]) ++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ PKG_CONFIG="" ++ fi ++ ++fi[]dnl ++])# PKG_PROG_PKG_CONFIG ++ ++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) ++# ++# Check to see whether a particular set of modules exists. Similar ++# to PKG_CHECK_MODULES(), but does not set variables or print errors. ++# ++# ++# Similar to PKG_CHECK_MODULES, make sure that the first instance of ++# this or PKG_CHECK_MODULES is called, or make sure to call ++# PKG_CHECK_EXISTS manually ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_EXISTS], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++if test -n "$PKG_CONFIG" && \ ++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then ++ m4_ifval([$2], [$2], [:]) ++m4_ifvaln([$3], [else ++ $3])dnl ++fi]) ++ ++ ++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) ++# --------------------------------------------- ++m4_define([_PKG_CONFIG], ++[if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ elif test -n "$PKG_CONFIG"; then ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ else ++ pkg_failed=untried ++fi[]dnl ++])# _PKG_CONFIG ++ ++# _PKG_SHORT_ERRORS_SUPPORTED ++# ----------------------------- ++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi[]dnl ++])# _PKG_SHORT_ERRORS_SUPPORTED ++ ++ ++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], ++# [ACTION-IF-NOT-FOUND]) ++# ++# ++# Note that if there is a possibility the first call to ++# PKG_CHECK_MODULES might not happen, you should be sure to include an ++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac ++# ++# ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_MODULES], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl ++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl ++ ++pkg_failed=no ++AC_MSG_CHECKING([for $1]) ++ ++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++ ++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS ++and $1[]_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details.]) ++ ++if test $pkg_failed = yes; then ++ _PKG_SHORT_ERRORS_SUPPORTED ++ if test $_pkg_short_errors_supported = yes; then ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` ++ else ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD ++ ++ ifelse([$4], , [AC_MSG_ERROR(dnl ++[Package requirements ($2) were not met: ++ ++$$1_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++_PKG_TEXT ++])], ++ [AC_MSG_RESULT([no]) ++ $4]) ++elif test $pkg_failed = untried; then ++ ifelse([$4], , [AC_MSG_FAILURE(dnl ++[The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++_PKG_TEXT ++ ++To get pkg-config, see .])], ++ [$4]) ++else ++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS ++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS ++ AC_MSG_RESULT([yes]) ++ ifelse([$3], , :, [$3]) ++fi[]dnl ++])# PKG_CHECK_MODULES ++ + # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation +diff -up libftdi-0.18/configure.in.libusb libftdi-0.18/configure.in +--- libftdi-0.18/configure.in.libusb 2010-06-25 17:04:13.000000000 +0200 ++++ libftdi-0.18/configure.in 2010-12-06 11:20:30.748660156 +0100 +@@ -7,30 +7,12 @@ AC_PROG_CC + AM_PROG_LIBTOOL + AC_PROG_CXX + +-dnl check for libusb-config +-AC_CHECK_TOOL(HAVELIBUSB, libusb-config) +- +-if test ! -z "$HAVELIBUSB"; then +- LIBUSB_CFLAGS=`$HAVELIBUSB --cflags` +- LIBUSB_LIBS=`$HAVELIBUSB --libs` +- ++dnl check for libusb ++PKG_CHECK_MODULES(LIBUSB, libusb, ++[ + CFLAGS="$CFLAGS $LIBUSB_CFLAGS" + LIBS="$LIBS $LIBUSB_LIBS" +-else +- AC_MSG_ERROR([*** libusb-config not found. You need a working libusb installation.]) +-fi +- +-dnl check for version of libusb +-AC_MSG_CHECKING([if libusb version is >= 0.1.7]) +-libusb_version_needed="1007" +-libusb_version=`$HAVELIBUSB --version | sed -e "s/libusb //" | awk 'BEGIN { FS = "."; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'` +- +-if test $libusb_version -lt $libusb_version_needed; then +- AC_MSG_RESULT(no) +- AC_MSG_ERROR([*** libusb is too old ($libusb_version). You need a libusb installation newer or equal to 0.1.7.]) +-else +- AC_MSG_RESULT(yes) +-fi ++]) + + ENABLE_ASYNC_MODE=0 + AC_ARG_WITH(async-mode, +diff -up libftdi-0.18/configure.libusb libftdi-0.18/configure +--- libftdi-0.18/configure.libusb 2010-12-06 11:20:51.143153972 +0100 ++++ libftdi-0.18/configure 2010-12-06 11:23:52.276158997 +0100 +@@ -815,7 +815,9 @@ BOOST_CPPFLAGS + BUILD_EXAMPLES_FALSE + BUILD_EXAMPLES_TRUE + ENABLE_ASYNC_MODE +-HAVELIBUSB ++LIBUSB_LIBS ++LIBUSB_CFLAGS ++PKG_CONFIG + CXXCPP + am__fastdepCXX_FALSE + am__fastdepCXX_TRUE +@@ -957,7 +959,10 @@ CPP + CXX + CXXFLAGS + CCC +-CXXCPP' ++CXXCPP ++PKG_CONFIG ++LIBUSB_CFLAGS ++LIBUSB_LIBS' + + + # Initialize some variables set by options. +@@ -1629,6 +1634,10 @@ Some influential environment variables: + CXX C++ compiler command + CXXFLAGS C++ compiler flags + CXXCPP C++ preprocessor ++ PKG_CONFIG path to pkg-config utility ++ LIBUSB_CFLAGS ++ C compiler flags for LIBUSB, overriding pkg-config ++ LIBUSB_LIBS linker flags for LIBUSB, overriding pkg-config + + Use these variables to override the choices made by `configure' or to help + it to find libraries and programs with nonstandard names/locations. +@@ -15290,25 +15299,30 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}libusb-config", so it can be a program name with args. +-set dummy ${ac_tool_prefix}libusb-config; ac_word=$2 ++ ++ ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. ++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 + { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_HAVELIBUSB+set}" = set; then ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- if test -n "$HAVELIBUSB"; then +- ac_cv_prog_HAVELIBUSB="$HAVELIBUSB" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ case $PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_HAVELIBUSB="${ac_tool_prefix}libusb-config" ++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -15316,12 +15330,13 @@ done + done + IFS=$as_save_IFS + ++ ;; ++esac + fi +-fi +-HAVELIBUSB=$ac_cv_prog_HAVELIBUSB +-if test -n "$HAVELIBUSB"; then +- { $as_echo "$as_me:$LINENO: result: $HAVELIBUSB" >&5 +-$as_echo "$HAVELIBUSB" >&6; } ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++if test -n "$PKG_CONFIG"; then ++ { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++$as_echo "$PKG_CONFIG" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } +@@ -15329,26 +15344,28 @@ fi + + + fi +-if test -z "$ac_cv_prog_HAVELIBUSB"; then +- ac_ct_HAVELIBUSB=$HAVELIBUSB +- # Extract the first word of "libusb-config", so it can be a program name with args. +-set dummy libusb-config; ac_word=$2 ++if test -z "$ac_cv_path_PKG_CONFIG"; then ++ ac_pt_PKG_CONFIG=$PKG_CONFIG ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 + { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_HAVELIBUSB+set}" = set; then ++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- if test -n "$ac_ct_HAVELIBUSB"; then +- ac_cv_prog_ac_ct_HAVELIBUSB="$ac_ct_HAVELIBUSB" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ case $ac_pt_PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_HAVELIBUSB="libusb-config" ++ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -15356,19 +15373,20 @@ done + done + IFS=$as_save_IFS + ++ ;; ++esac + fi +-fi +-ac_ct_HAVELIBUSB=$ac_cv_prog_ac_ct_HAVELIBUSB +-if test -n "$ac_ct_HAVELIBUSB"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_HAVELIBUSB" >&5 +-$as_echo "$ac_ct_HAVELIBUSB" >&6; } ++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG ++if test -n "$ac_pt_PKG_CONFIG"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 ++$as_echo "$ac_pt_PKG_CONFIG" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } + fi + +- if test "x$ac_ct_HAVELIBUSB" = x; then +- HAVELIBUSB="" ++ if test "x$ac_pt_PKG_CONFIG" = x; then ++ PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in + yes:) +@@ -15376,39 +15394,138 @@ yes:) + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +- HAVELIBUSB=$ac_ct_HAVELIBUSB ++ PKG_CONFIG=$ac_pt_PKG_CONFIG + fi + else +- HAVELIBUSB="$ac_cv_prog_HAVELIBUSB" ++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" + fi + ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=0.9.0 ++ { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 ++$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } ++ else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++ PKG_CONFIG="" ++ fi + +-if test ! -z "$HAVELIBUSB"; then +- LIBUSB_CFLAGS=`$HAVELIBUSB --cflags` +- LIBUSB_LIBS=`$HAVELIBUSB --libs` ++fi + +- CFLAGS="$CFLAGS $LIBUSB_CFLAGS" +- LIBS="$LIBS $LIBUSB_LIBS" ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for LIBUSB" >&5 ++$as_echo_n "checking for LIBUSB... " >&6; } ++ ++if test -n "$LIBUSB_CFLAGS"; then ++ pkg_cv_LIBUSB_CFLAGS="$LIBUSB_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libusb") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_LIBUSB_CFLAGS=`$PKG_CONFIG --cflags "libusb" 2>/dev/null` + else +- { { $as_echo "$as_me:$LINENO: error: *** libusb-config not found. You need a working libusb installation." >&5 +-$as_echo "$as_me: error: *** libusb-config not found. You need a working libusb installation." >&2;} +- { (exit 1); exit 1; }; } ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$LIBUSB_LIBS"; then ++ pkg_cv_LIBUSB_LIBS="$LIBUSB_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libusb") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_LIBUSB_LIBS=`$PKG_CONFIG --libs "libusb" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried + fi + +-{ $as_echo "$as_me:$LINENO: checking if libusb version is >= 0.1.7" >&5 +-$as_echo_n "checking if libusb version is >= 0.1.7... " >&6; } +-libusb_version_needed="1007" +-libusb_version=`$HAVELIBUSB --version | sed -e "s/libusb //" | awk 'BEGIN { FS = "."; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'` + +-if test $libusb_version -lt $libusb_version_needed; then +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- { { $as_echo "$as_me:$LINENO: error: *** libusb is too old ($libusb_version). You need a libusb installation newer or equal to 0.1.7." >&5 +-$as_echo "$as_me: error: *** libusb is too old ($libusb_version). You need a libusb installation newer or equal to 0.1.7." >&2;} ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ LIBUSB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libusb" 2>&1` ++ else ++ LIBUSB_PKG_ERRORS=`$PKG_CONFIG --print-errors "libusb" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$LIBUSB_PKG_ERRORS" >&5 ++ ++ { { $as_echo "$as_me:$LINENO: error: Package requirements (libusb) were not met: ++ ++$LIBUSB_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables LIBUSB_CFLAGS ++and LIBUSB_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" >&5 ++$as_echo "$as_me: error: Package requirements (libusb) were not met: ++ ++$LIBUSB_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables LIBUSB_CFLAGS ++and LIBUSB_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" >&2;} + { (exit 1); exit 1; }; } ++elif test $pkg_failed = untried; then ++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables LIBUSB_CFLAGS ++and LIBUSB_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see . ++See \`config.log' for more details." >&5 ++$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables LIBUSB_CFLAGS ++and LIBUSB_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see . ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; }; } + else +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ LIBUSB_CFLAGS=$pkg_cv_LIBUSB_CFLAGS ++ LIBUSB_LIBS=$pkg_cv_LIBUSB_LIBS ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 + $as_echo "yes" >&6; } ++ ++ CFLAGS="$CFLAGS $LIBUSB_CFLAGS" ++ LIBS="$LIBS $LIBUSB_LIBS" ++ + fi + + ENABLE_ASYNC_MODE=0 diff --git a/libftdi.spec b/libftdi.spec index db5e778..6b44e31 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.18 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -10,6 +10,8 @@ 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-multilib.patch +# update to recent libusb +Patch1: libftdi-0.18-libusb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel, doxygen, boost-devel, python-devel, swig @@ -63,6 +65,7 @@ sed -i -e 's/HTML_FOOTER =/HTML_FOOTER = no_date_footer.ht #kernel does not provide usb_device anymore sed -i -e 's/usb_device/usb/g' packages/99-libftdi.rules %patch0 -p1 -b .multilib +%patch1 -p1 -b .libusb %build @@ -139,6 +142,9 @@ exit 0 %postun c++ -p /sbin/ldconfig %changelog +* Mon Dec 06 2010 Dan Horák - 0.18-4 +- fix build with libusb >= 1:0.1.3 (wrapper around libusb1) + * Sun Aug 1 2010 Thomas Spura - 0.18-3 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild From d66da5361f3c46e5d6c77ab02b6550a3e0d7b917 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 23:49:15 -0600 Subject: [PATCH 27/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 6b44e31..4ed8f0b 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.18 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -142,6 +142,9 @@ exit 0 %postun c++ -p /sbin/ldconfig %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0.18-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Dec 06 2010 Dan Horák - 0.18-4 - fix build with libusb >= 1:0.1.3 (wrapper around libusb1) From eb452d4042aa3345e134ac3399f648deb318db06 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sat, 18 Jun 2011 08:49:23 +0300 Subject: [PATCH 28/79] new upstream release --- .gitignore | 1 + libftdi-0.18-libusb.patch | 526 -------------------------------------- libftdi-0.19-libusb.patch | 38 +++ libftdi.spec | 13 +- sources | 2 +- 5 files changed, 50 insertions(+), 530 deletions(-) delete mode 100644 libftdi-0.18-libusb.patch create mode 100644 libftdi-0.19-libusb.patch diff --git a/.gitignore b/.gitignore index fc45c97..de01df7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libftdi-0.18.tar.gz +/libftdi-0.19.tar.gz diff --git a/libftdi-0.18-libusb.patch b/libftdi-0.18-libusb.patch deleted file mode 100644 index 8fa5c98..0000000 --- a/libftdi-0.18-libusb.patch +++ /dev/null @@ -1,526 +0,0 @@ -diff -up libftdi-0.18/aclocal.m4.libusb libftdi-0.18/aclocal.m4 ---- libftdi-0.18/aclocal.m4.libusb 2010-12-06 11:22:51.207159911 +0100 -+++ libftdi-0.18/aclocal.m4 2010-12-06 11:23:46.692156198 +0100 -@@ -7968,6 +7968,162 @@ m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_D - m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) - m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) - -+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -+# -+# Copyright © 2004 Scott James Remnant . -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program that contains a -+# configuration script generated by Autoconf, you may include it under -+# the same distribution terms that you use for the rest of that program. -+ -+# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -+# ---------------------------------- -+AC_DEFUN([PKG_PROG_PKG_CONFIG], -+[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -+m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl -+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -+fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=m4_default([$1], [0.9.0]) -+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) -+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ PKG_CONFIG="" -+ fi -+ -+fi[]dnl -+])# PKG_PROG_PKG_CONFIG -+ -+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -+# -+# Check to see whether a particular set of modules exists. Similar -+# to PKG_CHECK_MODULES(), but does not set variables or print errors. -+# -+# -+# Similar to PKG_CHECK_MODULES, make sure that the first instance of -+# this or PKG_CHECK_MODULES is called, or make sure to call -+# PKG_CHECK_EXISTS manually -+# -------------------------------------------------------------- -+AC_DEFUN([PKG_CHECK_EXISTS], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+if test -n "$PKG_CONFIG" && \ -+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then -+ m4_ifval([$2], [$2], [:]) -+m4_ifvaln([$3], [else -+ $3])dnl -+fi]) -+ -+ -+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -+# --------------------------------------------- -+m4_define([_PKG_CONFIG], -+[if test -n "$$1"; then -+ pkg_cv_[]$1="$$1" -+ elif test -n "$PKG_CONFIG"; then -+ PKG_CHECK_EXISTS([$3], -+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], -+ [pkg_failed=yes]) -+ else -+ pkg_failed=untried -+fi[]dnl -+])# _PKG_CONFIG -+ -+# _PKG_SHORT_ERRORS_SUPPORTED -+# ----------------------------- -+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi[]dnl -+])# _PKG_SHORT_ERRORS_SUPPORTED -+ -+ -+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -+# [ACTION-IF-NOT-FOUND]) -+# -+# -+# Note that if there is a possibility the first call to -+# PKG_CHECK_MODULES might not happen, you should be sure to include an -+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -+# -+# -+# -------------------------------------------------------------- -+AC_DEFUN([PKG_CHECK_MODULES], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -+ -+pkg_failed=no -+AC_MSG_CHECKING([for $1]) -+ -+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -+_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -+ -+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -+and $1[]_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details.]) -+ -+if test $pkg_failed = yes; then -+ _PKG_SHORT_ERRORS_SUPPORTED -+ if test $_pkg_short_errors_supported = yes; then -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` -+ else -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -+ -+ ifelse([$4], , [AC_MSG_ERROR(dnl -+[Package requirements ($2) were not met: -+ -+$$1_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+_PKG_TEXT -+])], -+ [AC_MSG_RESULT([no]) -+ $4]) -+elif test $pkg_failed = untried; then -+ ifelse([$4], , [AC_MSG_FAILURE(dnl -+[The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+_PKG_TEXT -+ -+To get pkg-config, see .])], -+ [$4]) -+else -+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS -+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS -+ AC_MSG_RESULT([yes]) -+ ifelse([$3], , :, [$3]) -+fi[]dnl -+])# PKG_CHECK_MODULES -+ - # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation -diff -up libftdi-0.18/configure.in.libusb libftdi-0.18/configure.in ---- libftdi-0.18/configure.in.libusb 2010-06-25 17:04:13.000000000 +0200 -+++ libftdi-0.18/configure.in 2010-12-06 11:20:30.748660156 +0100 -@@ -7,30 +7,12 @@ AC_PROG_CC - AM_PROG_LIBTOOL - AC_PROG_CXX - --dnl check for libusb-config --AC_CHECK_TOOL(HAVELIBUSB, libusb-config) -- --if test ! -z "$HAVELIBUSB"; then -- LIBUSB_CFLAGS=`$HAVELIBUSB --cflags` -- LIBUSB_LIBS=`$HAVELIBUSB --libs` -- -+dnl check for libusb -+PKG_CHECK_MODULES(LIBUSB, libusb, -+[ - CFLAGS="$CFLAGS $LIBUSB_CFLAGS" - LIBS="$LIBS $LIBUSB_LIBS" --else -- AC_MSG_ERROR([*** libusb-config not found. You need a working libusb installation.]) --fi -- --dnl check for version of libusb --AC_MSG_CHECKING([if libusb version is >= 0.1.7]) --libusb_version_needed="1007" --libusb_version=`$HAVELIBUSB --version | sed -e "s/libusb //" | awk 'BEGIN { FS = "."; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'` -- --if test $libusb_version -lt $libusb_version_needed; then -- AC_MSG_RESULT(no) -- AC_MSG_ERROR([*** libusb is too old ($libusb_version). You need a libusb installation newer or equal to 0.1.7.]) --else -- AC_MSG_RESULT(yes) --fi -+]) - - ENABLE_ASYNC_MODE=0 - AC_ARG_WITH(async-mode, -diff -up libftdi-0.18/configure.libusb libftdi-0.18/configure ---- libftdi-0.18/configure.libusb 2010-12-06 11:20:51.143153972 +0100 -+++ libftdi-0.18/configure 2010-12-06 11:23:52.276158997 +0100 -@@ -815,7 +815,9 @@ BOOST_CPPFLAGS - BUILD_EXAMPLES_FALSE - BUILD_EXAMPLES_TRUE - ENABLE_ASYNC_MODE --HAVELIBUSB -+LIBUSB_LIBS -+LIBUSB_CFLAGS -+PKG_CONFIG - CXXCPP - am__fastdepCXX_FALSE - am__fastdepCXX_TRUE -@@ -957,7 +959,10 @@ CPP - CXX - CXXFLAGS - CCC --CXXCPP' -+CXXCPP -+PKG_CONFIG -+LIBUSB_CFLAGS -+LIBUSB_LIBS' - - - # Initialize some variables set by options. -@@ -1629,6 +1634,10 @@ Some influential environment variables: - CXX C++ compiler command - CXXFLAGS C++ compiler flags - CXXCPP C++ preprocessor -+ PKG_CONFIG path to pkg-config utility -+ LIBUSB_CFLAGS -+ C compiler flags for LIBUSB, overriding pkg-config -+ LIBUSB_LIBS linker flags for LIBUSB, overriding pkg-config - - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. -@@ -15290,25 +15299,30 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}libusb-config", so it can be a program name with args. --set dummy ${ac_tool_prefix}libusb-config; ac_word=$2 -+ -+ -+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 - { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_HAVELIBUSB+set}" = set; then -+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- if test -n "$HAVELIBUSB"; then -- ac_cv_prog_HAVELIBUSB="$HAVELIBUSB" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+ case $PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_HAVELIBUSB="${ac_tool_prefix}libusb-config" -+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -15316,12 +15330,13 @@ done - done - IFS=$as_save_IFS - -+ ;; -+esac - fi --fi --HAVELIBUSB=$ac_cv_prog_HAVELIBUSB --if test -n "$HAVELIBUSB"; then -- { $as_echo "$as_me:$LINENO: result: $HAVELIBUSB" >&5 --$as_echo "$HAVELIBUSB" >&6; } -+PKG_CONFIG=$ac_cv_path_PKG_CONFIG -+if test -n "$PKG_CONFIG"; then -+ { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -+$as_echo "$PKG_CONFIG" >&6; } - else - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } -@@ -15329,26 +15344,28 @@ fi - - - fi --if test -z "$ac_cv_prog_HAVELIBUSB"; then -- ac_ct_HAVELIBUSB=$HAVELIBUSB -- # Extract the first word of "libusb-config", so it can be a program name with args. --set dummy libusb-config; ac_word=$2 -+if test -z "$ac_cv_path_PKG_CONFIG"; then -+ ac_pt_PKG_CONFIG=$PKG_CONFIG -+ # Extract the first word of "pkg-config", so it can be a program name with args. -+set dummy pkg-config; ac_word=$2 - { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_HAVELIBUSB+set}" = set; then -+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- if test -n "$ac_ct_HAVELIBUSB"; then -- ac_cv_prog_ac_ct_HAVELIBUSB="$ac_ct_HAVELIBUSB" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+ case $ac_pt_PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_ac_ct_HAVELIBUSB="libusb-config" -+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -15356,19 +15373,20 @@ done - done - IFS=$as_save_IFS - -+ ;; -+esac - fi --fi --ac_ct_HAVELIBUSB=$ac_cv_prog_ac_ct_HAVELIBUSB --if test -n "$ac_ct_HAVELIBUSB"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_HAVELIBUSB" >&5 --$as_echo "$ac_ct_HAVELIBUSB" >&6; } -+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -+if test -n "$ac_pt_PKG_CONFIG"; then -+ { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -+$as_echo "$ac_pt_PKG_CONFIG" >&6; } - else - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -- if test "x$ac_ct_HAVELIBUSB" = x; then -- HAVELIBUSB="" -+ if test "x$ac_pt_PKG_CONFIG" = x; then -+ PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in - yes:) -@@ -15376,39 +15394,138 @@ yes:) - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -- HAVELIBUSB=$ac_ct_HAVELIBUSB -+ PKG_CONFIG=$ac_pt_PKG_CONFIG - fi - else -- HAVELIBUSB="$ac_cv_prog_HAVELIBUSB" -+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" - fi - -+fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=0.9.0 -+ { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } -+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+ PKG_CONFIG="" -+ fi - --if test ! -z "$HAVELIBUSB"; then -- LIBUSB_CFLAGS=`$HAVELIBUSB --cflags` -- LIBUSB_LIBS=`$HAVELIBUSB --libs` -+fi - -- CFLAGS="$CFLAGS $LIBUSB_CFLAGS" -- LIBS="$LIBS $LIBUSB_LIBS" -+pkg_failed=no -+{ $as_echo "$as_me:$LINENO: checking for LIBUSB" >&5 -+$as_echo_n "checking for LIBUSB... " >&6; } -+ -+if test -n "$LIBUSB_CFLAGS"; then -+ pkg_cv_LIBUSB_CFLAGS="$LIBUSB_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "libusb") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_LIBUSB_CFLAGS=`$PKG_CONFIG --cflags "libusb" 2>/dev/null` - else -- { { $as_echo "$as_me:$LINENO: error: *** libusb-config not found. You need a working libusb installation." >&5 --$as_echo "$as_me: error: *** libusb-config not found. You need a working libusb installation." >&2;} -- { (exit 1); exit 1; }; } -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+if test -n "$LIBUSB_LIBS"; then -+ pkg_cv_LIBUSB_LIBS="$LIBUSB_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "libusb") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_LIBUSB_LIBS=`$PKG_CONFIG --libs "libusb" 2>/dev/null` -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried - fi - --{ $as_echo "$as_me:$LINENO: checking if libusb version is >= 0.1.7" >&5 --$as_echo_n "checking if libusb version is >= 0.1.7... " >&6; } --libusb_version_needed="1007" --libusb_version=`$HAVELIBUSB --version | sed -e "s/libusb //" | awk 'BEGIN { FS = "."; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'` - --if test $libusb_version -lt $libusb_version_needed; then -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -- { { $as_echo "$as_me:$LINENO: error: *** libusb is too old ($libusb_version). You need a libusb installation newer or equal to 0.1.7." >&5 --$as_echo "$as_me: error: *** libusb is too old ($libusb_version). You need a libusb installation newer or equal to 0.1.7." >&2;} -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ LIBUSB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libusb" 2>&1` -+ else -+ LIBUSB_PKG_ERRORS=`$PKG_CONFIG --print-errors "libusb" 2>&1` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$LIBUSB_PKG_ERRORS" >&5 -+ -+ { { $as_echo "$as_me:$LINENO: error: Package requirements (libusb) were not met: -+ -+$LIBUSB_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables LIBUSB_CFLAGS -+and LIBUSB_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+$as_echo "$as_me: error: Package requirements (libusb) were not met: -+ -+$LIBUSB_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables LIBUSB_CFLAGS -+and LIBUSB_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&2;} - { (exit 1); exit 1; }; } -+elif test $pkg_failed = untried; then -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables LIBUSB_CFLAGS -+and LIBUSB_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables LIBUSB_CFLAGS -+and LIBUSB_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - else -- { $as_echo "$as_me:$LINENO: result: yes" >&5 -+ LIBUSB_CFLAGS=$pkg_cv_LIBUSB_CFLAGS -+ LIBUSB_LIBS=$pkg_cv_LIBUSB_LIBS -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 - $as_echo "yes" >&6; } -+ -+ CFLAGS="$CFLAGS $LIBUSB_CFLAGS" -+ LIBS="$LIBS $LIBUSB_LIBS" -+ - fi - - ENABLE_ASYNC_MODE=0 diff --git a/libftdi-0.19-libusb.patch b/libftdi-0.19-libusb.patch new file mode 100644 index 0000000..dcdae5d --- /dev/null +++ b/libftdi-0.19-libusb.patch @@ -0,0 +1,38 @@ +diff -Naur libftdi-0.19/configure.in libftdi-0.19-mod/configure.in +--- libftdi-0.19/configure.in 2011-05-20 17:30:40.000000000 +0300 ++++ libftdi-0.19-mod/configure.in 2011-06-18 08:38:02.000000000 +0300 +@@ -7,30 +7,12 @@ + AM_PROG_LIBTOOL + AC_PROG_CXX + +-dnl check for libusb-config +-AC_CHECK_TOOL(HAVELIBUSB, libusb-config) +- +-if test ! -z "$HAVELIBUSB"; then +- LIBUSB_CFLAGS=`$HAVELIBUSB --cflags` +- LIBUSB_LIBS=`$HAVELIBUSB --libs` +- ++dnl check for libusb ++PKG_CHECK_MODULES(LIBUSB, libusb, ++[ + CFLAGS="$CFLAGS $LIBUSB_CFLAGS" + LIBS="$LIBS $LIBUSB_LIBS" +-else +- AC_MSG_ERROR([*** libusb-config not found. You need a working libusb installation.]) +-fi +- +-dnl check for version of libusb +-AC_MSG_CHECKING([if libusb version is >= 0.1.7]) +-libusb_version_needed="1007" +-libusb_version=`$HAVELIBUSB --version | sed -e "s/libusb //" | awk 'BEGIN { FS = "."; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'` +- +-if test $libusb_version -lt $libusb_version_needed; then +- AC_MSG_RESULT(no) +- AC_MSG_ERROR([*** libusb is too old ($libusb_version). You need a libusb installation newer or equal to 0.1.7.]) +-else +- AC_MSG_RESULT(yes) +-fi ++]) + + ENABLE_ASYNC_MODE=0 + AC_ARG_WITH(async-mode, diff --git a/libftdi.spec b/libftdi.spec index 4ed8f0b..2f724f2 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.18 -Release: 5%{?dist} +Version: 0.19 +Release: 1%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -11,7 +11,7 @@ Source0: http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/%{name}-%{vers Source1: no_date_footer.html Patch0: libftdi-0.17-multilib.patch # update to recent libusb -Patch1: libftdi-0.18-libusb.patch +Patch1: libftdi-0.19-libusb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel, doxygen, boost-devel, python-devel, swig @@ -69,6 +69,7 @@ sed -i -e 's/usb_device/usb/g' packages/99-libftdi.rules %build +autoreconf -if %configure --enable-python-binding --enable-libftdipp --disable-static cp %{SOURCE1} %{_builddir}/%{name}-%{version}/doc make %{?_smp_mflags} @@ -142,6 +143,12 @@ exit 0 %postun c++ -p /sbin/ldconfig %changelog +* Sat Jun 18 2011 Lucian Langa - 0.19-1 +- new upstream release + +* Tue May 24 2011 Lucian Langa - 0.19-1 +- new upstream release + * Mon Feb 07 2011 Fedora Release Engineering - 0.18-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 21bdf39..a95c090 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -916f65fa68d154621fc0cf1f405f2726 libftdi-0.18.tar.gz +e6e25f33b4327b1b7aa1156947da45f3 libftdi-0.19.tar.gz From 2f1710950a74a88a193bcd4d482617a3fd148b7f Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sat, 18 Jun 2011 08:57:57 +0300 Subject: [PATCH 29/79] add missing BR --- libftdi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 2f724f2..6513114 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -15,7 +15,7 @@ Patch1: libftdi-0.19-libusb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel, doxygen, boost-devel, python-devel, swig -Requires: pkgconfig, udev +Requires: pkgconfig, udev, autoconf Requires(pre): shadow-utils From 7596ddd3196632a951735c1af851654483bba3d1 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sat, 18 Jun 2011 09:10:03 +0300 Subject: [PATCH 30/79] add missing BR --- libftdi.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libftdi.spec b/libftdi.spec index 6513114..f0338a8 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -14,8 +14,8 @@ Patch0: libftdi-0.17-multilib.patch Patch1: libftdi-0.19-libusb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libusb-devel, doxygen, boost-devel, python-devel, swig -Requires: pkgconfig, udev, autoconf +BuildRequires: libusb-devel, doxygen, boost-devel, python-devel, swig, autoconf +Requires: pkgconfig, udev Requires(pre): shadow-utils From 525cf0664a3de87c63cb14d3c259325e67a943b0 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sat, 18 Jun 2011 13:43:02 +0300 Subject: [PATCH 31/79] fix BR again --- libftdi.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index f0338a8..2e41c01 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -14,7 +14,8 @@ Patch0: libftdi-0.17-multilib.patch Patch1: libftdi-0.19-libusb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libusb-devel, doxygen, boost-devel, python-devel, swig, autoconf +BuildRequires: libusb-devel, doxygen, boost-devel, python-devel, swig +BuildRequires: autoconf, automake, libtool Requires: pkgconfig, udev Requires(pre): shadow-utils From e0e8310da859cf9571afbf979f825190e9d6251a Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Fri, 25 Nov 2011 08:38:31 +0100 Subject: [PATCH 32/79] fix too generic man name --- libftdi.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libftdi.spec b/libftdi.spec index 2e41c01..dd0044a 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -80,6 +80,8 @@ make %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" find %{buildroot} -name \*\.la -print | xargs rm -f +#too generic name +mv doc/man/man3/deprecated.3 doc/man/man3/libftdi-deprecated.3 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 #no man install install -p -m 644 doc/man/man3/*.3 $RPM_BUILD_ROOT%{_mandir}/man3 From ebe1a6c4cffbea7ec171fe106058daca5f79f8eb Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Fri, 25 Nov 2011 08:56:06 +0100 Subject: [PATCH 33/79] too generic man name --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index dd0044a..d1a1052 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.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -146,6 +146,9 @@ exit 0 %postun c++ -p /sbin/ldconfig %changelog +* Fri Nov 25 2011 Lucian Langa - 0.19-2 +- fix bug #678781 - too generic name in man file + * Sat Jun 18 2011 Lucian Langa - 0.19-1 - new upstream release From 4851bec394003e8750994f7217b7a0623abc2734 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 01:41:19 -0600 Subject: [PATCH 34/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index d1a1052..962e621 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.19 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -146,6 +146,9 @@ exit 0 %postun c++ -p /sbin/ldconfig %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 0.19-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Fri Nov 25 2011 Lucian Langa - 0.19-2 - fix bug #678781 - too generic name in man file From d97465969e3927e6744d692f212fc16b8c81b03e Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Fri, 4 May 2012 22:33:17 +0200 Subject: [PATCH 35/79] new upstream release --- .gitignore | 1 + libftdi.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index de01df7..827f45e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ libftdi-0.18.tar.gz /libftdi-0.19.tar.gz +/libftdi-0.20.tar.gz diff --git a/libftdi.spec b/libftdi.spec index 962e621..71b5311 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.19 -Release: 3%{?dist} +Version: 0.20 +Release: 1%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -99,6 +99,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/find_all rm -f $RPM_BUILD_ROOT/%{_bindir}/find_all_pp rm -f $RPM_BUILD_ROOT/%{_bindir}/baud_test rm -f $RPM_BUILD_ROOT/%{_bindir}/serial_read +rm -f $RPM_BUILD_ROOT/%{_bindir}/serial_test %clean rm -rf $RPM_BUILD_ROOT @@ -146,6 +147,9 @@ exit 0 %postun c++ -p /sbin/ldconfig %changelog +* Fri May 04 2012 Lucian Langa - 0.20-1 +- new upstream release + * Fri Jan 13 2012 Fedora Release Engineering - 0.19-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index a95c090..e240d84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e6e25f33b4327b1b7aa1156947da45f3 libftdi-0.19.tar.gz +355d4474e3faa81b485d6a604b06951f libftdi-0.20.tar.gz From 711d36b163bae0aaf2ce4372d6d1b4459e30beef Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 14:47:23 -0500 Subject: [PATCH 36/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 71b5311..447262a 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.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -147,6 +147,9 @@ exit 0 %postun c++ -p /sbin/ldconfig %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 0.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri May 04 2012 Lucian Langa - 0.20-1 - new upstream release From b6d1705bc1ae9daf3dce6b088c43b4dba557246f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 22:21:23 -0600 Subject: [PATCH 37/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 447262a..5c1a82c 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.20 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -147,6 +147,9 @@ exit 0 %postun c++ -p /sbin/ldconfig %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 0.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Jul 19 2012 Fedora Release Engineering - 0.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 5adf0ef7a70cb708fcff9f3b469e8ab38a0ee020 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 30 Jul 2013 14:17:37 +0200 Subject: [PATCH 38/79] Rebuild for boost 1.54.0 --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 5c1a82c..3c3ada5 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.20 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -147,6 +147,9 @@ exit 0 %postun c++ -p /sbin/ldconfig %changelog +* Tue Jul 30 2013 Petr Machata - 0.20-4 +- Rebuild for boost 1.54.0 + * Thu Feb 14 2013 Fedora Release Engineering - 0.20-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From da7a951bde71149f248f17de5722ec1c8f8ef0b7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 00:28:17 -0500 Subject: [PATCH 39/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 3c3ada5..8e30e3f 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.20 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -147,6 +147,9 @@ exit 0 %postun c++ -p /sbin/ldconfig %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 0.20-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Jul 30 2013 Petr Machata - 0.20-4 - Rebuild for boost 1.54.0 From b1e1711b18d815f1e6aaeccd251ee596dd58a926 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 24 Mar 2014 15:19:11 +0000 Subject: [PATCH 40/79] Update to 1.1, Build against libusb1, Package cleanup, Run make check --- .gitignore | 4 +- libftdi-0.17-multilib.patch | 44 ------------ libftdi-0.19-libusb.patch | 38 ---------- libftdi.spec | 139 +++++++++++++++++------------------- no_date_footer.html | 7 -- sources | 2 +- 6 files changed, 69 insertions(+), 165 deletions(-) delete mode 100644 libftdi-0.17-multilib.patch delete mode 100644 libftdi-0.19-libusb.patch delete mode 100644 no_date_footer.html diff --git a/.gitignore b/.gitignore index 827f45e..846e2f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -libftdi-0.18.tar.gz -/libftdi-0.19.tar.gz -/libftdi-0.20.tar.gz +/libftdi*.tar.bz2 diff --git a/libftdi-0.17-multilib.patch b/libftdi-0.17-multilib.patch deleted file mode 100644 index ba26fa1..0000000 --- a/libftdi-0.17-multilib.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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@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@libdir@ -lftdi @LIBS@ --fi - diff --git a/libftdi-0.19-libusb.patch b/libftdi-0.19-libusb.patch deleted file mode 100644 index dcdae5d..0000000 --- a/libftdi-0.19-libusb.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -Naur libftdi-0.19/configure.in libftdi-0.19-mod/configure.in ---- libftdi-0.19/configure.in 2011-05-20 17:30:40.000000000 +0300 -+++ libftdi-0.19-mod/configure.in 2011-06-18 08:38:02.000000000 +0300 -@@ -7,30 +7,12 @@ - AM_PROG_LIBTOOL - AC_PROG_CXX - --dnl check for libusb-config --AC_CHECK_TOOL(HAVELIBUSB, libusb-config) -- --if test ! -z "$HAVELIBUSB"; then -- LIBUSB_CFLAGS=`$HAVELIBUSB --cflags` -- LIBUSB_LIBS=`$HAVELIBUSB --libs` -- -+dnl check for libusb -+PKG_CHECK_MODULES(LIBUSB, libusb, -+[ - CFLAGS="$CFLAGS $LIBUSB_CFLAGS" - LIBS="$LIBS $LIBUSB_LIBS" --else -- AC_MSG_ERROR([*** libusb-config not found. You need a working libusb installation.]) --fi -- --dnl check for version of libusb --AC_MSG_CHECKING([if libusb version is >= 0.1.7]) --libusb_version_needed="1007" --libusb_version=`$HAVELIBUSB --version | sed -e "s/libusb //" | awk 'BEGIN { FS = "."; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'` -- --if test $libusb_version -lt $libusb_version_needed; then -- AC_MSG_RESULT(no) -- AC_MSG_ERROR([*** libusb is too old ($libusb_version). You need a libusb installation newer or equal to 0.1.7.]) --else -- AC_MSG_RESULT(yes) --fi -+]) - - ENABLE_ASYNC_MODE=0 - AC_ARG_WITH(async-mode, diff --git a/libftdi.spec b/libftdi.spec index 8e30e3f..d58ad54 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,59 +1,58 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: libftdi -Version: 0.20 -Release: 5%{?dist} +Version: 1.1 +Release: 1%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries 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-multilib.patch -# update to recent libusb -Patch1: libftdi-0.19-libusb.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: http://www.intra2net.com/en/developer/%{name}/download/%{name}1-%{version}.tar.bz2 -BuildRequires: libusb-devel, doxygen, boost-devel, python-devel, swig -BuildRequires: autoconf, automake, libtool -Requires: pkgconfig, udev -Requires(pre): shadow-utils +BuildRequires: boost-devel +BuildRequires: cmake +BuildRequires: doxygen +BuildRequires: libconfuse-devel +BuildRequires: libusbx-devel +BuildRequires: python-devel +BuildRequires: swig +Requires: systemd +%description +A library (using libusb) to talk to FTDI's FT2232C, +FT232BM and FT245BM type chips including the popular bitbang mode. + %package devel Summary: Header files and static libraries for libftdi Group: Development/Libraries -Requires: libftdi = %{version}-%{release} -Requires: libusb-devel +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: pkgconfig + +%description devel +Header files and static libraries for libftdi %package python Summary: Libftdi library Python binding Group: Development/Libraries -Requires: libftdi = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description python +Libftdi Python Language bindings. %package c++ Summary: Libftdi library C++ binding Group: Development/Libraries -Requires: libftdi = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description c++ +Libftdi library C++ language binding. %package c++-devel Summary: Libftdi library C++ binding development headers and libraries Group: Development/Libraries -Requires: libftdi-devel = %{version}-%{release}, libftdi-c++ = %{version}-%{release} - - -%description -A library (using libusb) to talk to FTDI's FT2232C, -FT232BM and FT245BM type chips including the popular bitbang mode. - -%description devel -Header files and static libraries for libftdi - -%description python -Libftdi Python Language bindings. - -%description c++ -Libftdi library C++ language binding. +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-c++ = %{version}-%{release} %description c++-devel Libftdi library C++ binding development headers and libraries @@ -61,33 +60,31 @@ for building C++ applications with libftdi. %prep -%setup -q -sed -i -e 's/HTML_FOOTER =/HTML_FOOTER = no_date_footer.html/g' doc/Doxyfile.in +%setup -q -n %{name}1-%{version} + #kernel does not provide usb_device anymore sed -i -e 's/usb_device/usb/g' packages/99-libftdi.rules -%patch0 -p1 -b .multilib -%patch1 -p1 -b .libusb - +sed -i -e 's/GROUP="plugdev"/TAG+="uaccess"/g' packages/99-libftdi.rules %build -autoreconf -if -%configure --enable-python-binding --enable-libftdipp --disable-static -cp %{SOURCE1} %{_builddir}/%{name}-%{version}/doc +export CMAKE_PREFIX_PATH=/usr +%{cmake} . + make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" -find %{buildroot} -name \*\.la -print | xargs rm -f -#too generic name -mv doc/man/man3/deprecated.3 doc/man/man3/libftdi-deprecated.3 -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 + +mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.d/ +install -p -m 644 packages/99-libftdi.rules $RPM_BUILD_ROOT/lib/udev/rules.d/69-libftdi.rules + +find $RPM_BUILD_ROOT -type f -name "*.la" -delete +find $RPM_BUILD_ROOT -type f -name "*.a" -delete + #no man install +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 install -p -m 644 doc/man/man3/*.3 $RPM_BUILD_ROOT%{_mandir}/man3 -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d -install -p -m 644 packages/99-libftdi.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d - # Cleanup examples rm -f $RPM_BUILD_ROOT/%{_bindir}/simple @@ -100,45 +97,37 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/find_all_pp rm -f $RPM_BUILD_ROOT/%{_bindir}/baud_test rm -f $RPM_BUILD_ROOT/%{_bindir}/serial_read rm -f $RPM_BUILD_ROOT/%{_bindir}/serial_test +rm -rf $RPM_BUILD_ROOT/%{_libdir}/cmake* + +%check +make check -%clean -rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING.LIB README -%{_libdir}/libftdi.so.* -%config(noreplace) %{_sysconfdir}/udev/rules.d/99-libftdi.rules +%{_libdir}/libftdi1.so.2* +/lib/udev/rules.d/69-libftdi.rules %files devel -%defattr(-,root,root,-) %doc doc/html -%{_bindir}/libftdi-config -%{_libdir}/libftdi.so -%{_includedir}/*.h -%{_libdir}/pkgconfig/libftdi.pc +%doc %{_datadir}/libftdi/examples +%{_bindir}/ftdi_eeprom +%{_bindir}/libftdi1-config +%{_libdir}/libftdi1.so +%{_includedir}/libftdi1 +%{_libdir}/pkgconfig/libftdi1.pc %{_mandir}/man3/* %files python -%defattr(-, root, root, -) -%doc AUTHORS ChangeLog COPYING.LIB README %{python_sitearch}/* %files c++ -%defattr(-, root, root, -) -%doc AUTHORS ChangeLog COPYING.LIB README -%{_libdir}/libftdipp.so.* +%{_libdir}/libftdipp1.so.2* %files c++-devel -%defattr(-, root, root, -) -%doc doc/html -%{_libdir}/libftdipp.so -%{_includedir}/*.hpp -%{_libdir}/pkgconfig/libftdipp.pc - -%pre -getent group plugdev >/dev/null || groupadd -r plugdev -exit 0 +%{_libdir}/libftdipp1.so +%{_includedir}/libftdi1/*hpp +%{_libdir}/pkgconfig/libftdipp1.pc %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -147,6 +136,12 @@ exit 0 %postun c++ -p /sbin/ldconfig %changelog +* Mon Mar 24 2014 Peter Robinson 1.1-1 +- Update to 1.1 +- Build against libusb1 +- Package cleanup +- Run make check + * Sat Aug 03 2013 Fedora Release Engineering - 0.20-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -202,7 +197,7 @@ exit 0 * Sat Jan 16 2010 Lucian Langa - 0.17-2 - do not package static libfiles (#556068) -* Sun Jan 01 2010 Lucian Langa - 0.17-1 +* Sun Jan 3 2010 Lucian Langa - 0.17-1 - add patch to fix typo in python bindings - drop multilib patch0 fixed upstream - new upstream release diff --git a/no_date_footer.html b/no_date_footer.html deleted file mode 100644 index 3d46190..0000000 --- a/no_date_footer.html +++ /dev/null @@ -1,7 +0,0 @@ -
-Generated for $projectname by doxygen -$doxygenversion
- - - diff --git a/sources b/sources index e240d84..cfc95f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -355d4474e3faa81b485d6a604b06951f libftdi-0.20.tar.gz +b79a6356978aa8e69f8eecc3a720ff79 libftdi1-1.1.tar.bz2 From 094a2612329754a7bfba6464e5df4d5a4bb69703 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 24 Mar 2014 15:30:50 +0000 Subject: [PATCH 41/79] disable test temporarily (works locally) --- libftdi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index d58ad54..520c287 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -100,7 +100,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/serial_test rm -rf $RPM_BUILD_ROOT/%{_libdir}/cmake* %check -make check +#make check %files From ec6bc46925615b4720d2dbafd9e64ba4fb74f50d Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Fri, 23 May 2014 03:42:57 +0200 Subject: [PATCH 42/79] Rebuild for boost 1.55.0 --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 520c287..6b55876 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: 1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/cmake* %postun c++ -p /sbin/ldconfig %changelog +* Fri May 23 2014 Petr Machata - 1.1-2 +- Rebuild for boost 1.55.0 + * Mon Mar 24 2014 Peter Robinson 1.1-1 - Update to 1.1 - Build against libusb1 From 6be1117b1c3fc3c072c16a4146d3f8472ab5a6a2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 22:24:33 -0500 Subject: [PATCH 43/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 6b55876..0615772 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: 1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/cmake* %postun c++ -p /sbin/ldconfig %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri May 23 2014 Petr Machata - 1.1-2 - Rebuild for boost 1.55.0 From b528e29d7c6cc11ab2e06aedd2357361a6cf864a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 03:21:24 +0000 Subject: [PATCH 44/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 0615772..926c628 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: 1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/cmake* %postun c++ -p /sbin/ldconfig %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From b9e20ae05ea11fc2384ec48041547fa1e9ee2bed Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 27 Jan 2015 08:31:40 +0100 Subject: [PATCH 45/79] Rebuild for boost 1.57.0 --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 926c628..bb8cfe5 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: 1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/cmake* %postun c++ -p /sbin/ldconfig %changelog +* Tue Jan 27 2015 Petr Machata - 1.1-5 +- Rebuild for boost 1.57.0 + * Sun Aug 17 2014 Fedora Release Engineering - 1.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From fc985735ef4eb416d7e2dbbf89887004a810aaa5 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 8 Feb 2015 09:15:53 +0000 Subject: [PATCH 46/79] Update to 1.2, Use %%license --- libftdi.spec | 12 +++++++++--- sources | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libftdi.spec b/libftdi.spec index bb8cfe5..6d9905b 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: 1.1 -Release: 5%{?dist} +Version: 1.2 +Release: 1%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -104,7 +104,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/cmake* %files -%doc AUTHORS ChangeLog COPYING.LIB README +%{!?_licensedir:%global license %%doc} +%license COPYING.LIB +%doc AUTHORS ChangeLog README %{_libdir}/libftdi1.so.2* /lib/udev/rules.d/69-libftdi.rules @@ -136,6 +138,10 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/cmake* %postun c++ -p /sbin/ldconfig %changelog +* Sun Feb 8 2015 Peter Robinson 1.2-1 +- Update to 1.2 +- Use %%license + * Tue Jan 27 2015 Petr Machata - 1.1-5 - Rebuild for boost 1.57.0 diff --git a/sources b/sources index cfc95f7..2e89832 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b79a6356978aa8e69f8eecc3a720ff79 libftdi1-1.1.tar.bz2 +89dff802d89c4c0d55d8b4665fd52d0b libftdi1-1.2.tar.bz2 From 32148bca5b1f6ee0ab6d65e5f0482194255cbbe3 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 15:17:33 +0200 Subject: [PATCH 47/79] Rebuilt for GCC 5 C++11 ABI change --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 6d9905b..fb4a257 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: 1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/cmake* %postun c++ -p /sbin/ldconfig %changelog +* Sat May 02 2015 Kalev Lember - 1.2-2 +- Rebuilt for GCC 5 C++11 ABI change + * Sun Feb 8 2015 Peter Robinson 1.2-1 - Update to 1.2 - Use %%license From 44e6b8ec11b310107138cf74d3bbafd6c58b829f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 15:17:39 +0000 Subject: [PATCH 48/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index fb4a257..c3b1c13 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: 1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/cmake* %postun c++ -p /sbin/ldconfig %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 1.2-2 - Rebuilt for GCC 5 C++11 ABI change From 2b457b225d8ab68b23a28e2f109484c1a3751069 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 22 Jul 2015 18:50:49 +0200 Subject: [PATCH 49/79] rebuild for Boost 1.58 --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index c3b1c13..0271e8b 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: 1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/cmake* %postun c++ -p /sbin/ldconfig %changelog +* Wed Jul 22 2015 David Tardon - 1.2-4 +- rebuild for Boost 1.58 + * Wed Jun 17 2015 Fedora Release Engineering - 1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 9d90314437394e96f42bb60a07e3f69a8a448c36 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 29 Jul 2015 12:35:42 -0500 Subject: [PATCH 50/79] - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 0271e8b..31e866d 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: 1.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/cmake* %postun c++ -p /sbin/ldconfig %changelog +* Wed Jul 29 2015 Fedora Release Engineering - 1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 + * Wed Jul 22 2015 David Tardon - 1.2-4 - rebuild for Boost 1.58 From 8e9b3a97b20425a69e68a0a1e25bbc5c76c7aff5 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 27 Aug 2015 20:57:16 +0100 Subject: [PATCH 51/79] Rebuilt for Boost 1.59 --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 31e866d..e1884ce 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: 1.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/cmake* %postun c++ -p /sbin/ldconfig %changelog +* Thu Aug 27 2015 Jonathan Wakely - 1.2-6 +- Rebuilt for Boost 1.59 + * Wed Jul 29 2015 Fedora Release Engineering - 1.2-5 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 From 23c173d5621a2dca40ee31539e01842e0a93be2d Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 15 Jan 2016 09:50:47 +0000 Subject: [PATCH 52/79] Rebuilt for Boost 1.60 --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index e1884ce..a9bdb3c 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: 1.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/cmake* %postun c++ -p /sbin/ldconfig %changelog +* Fri Jan 15 2016 Jonathan Wakely - 1.2-7 +- Rebuilt for Boost 1.60 + * Thu Aug 27 2015 Jonathan Wakely - 1.2-6 - Rebuilt for Boost 1.59 From 5e79b1b095f3d9274498d7c8902fa064547be26a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 03:10:43 +0000 Subject: [PATCH 53/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index a9bdb3c..d4b0206 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: 1.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/cmake* %postun c++ -p /sbin/ldconfig %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jan 15 2016 Jonathan Wakely - 1.2-7 - Rebuilt for Boost 1.60 From 04315bae3db85da2c1246d11485747f6fda4e647 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 14 Jun 2016 14:25:18 -0500 Subject: [PATCH 54/79] 1.3, libconfuse rebuild. --- libftdi-python-version.patch | 13 +++++++++++++ libftdi.spec | 17 ++++++++++++----- sources | 2 +- 3 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 libftdi-python-version.patch diff --git a/libftdi-python-version.patch b/libftdi-python-version.patch new file mode 100644 index 0000000..b80bdae --- /dev/null +++ b/libftdi-python-version.patch @@ -0,0 +1,13 @@ +--- python/CMakeLists.txt~ 2016-05-20 01:53:12.000000000 -0500 ++++ python/CMakeLists.txt 2016-06-14 14:07:30.001554507 -0500 +@@ -12,8 +12,8 @@ + set ( SWIG_FOUND TRUE ) + endif () + endif () +- find_package ( PythonLibs ) +- find_package ( PythonInterp ) ++ find_package ( PythonLibs 2.7 REQUIRED ) ++ find_package ( PythonInterp 2.7 REQUIRED ) + endif () + + if ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND ) diff --git a/libftdi.spec b/libftdi.spec index d4b0206..61f8b3f 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,20 +1,20 @@ -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: libftdi -Version: 1.2 -Release: 8%{?dist} +Version: 1.3 +Release: 1%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries License: LGPLv2 URL: http://www.intra2net.com/de/produkte/opensource/ftdi/ Source0: http://www.intra2net.com/en/developer/%{name}/download/%{name}1-%{version}.tar.bz2 +Patch0: libftdi-python-version.patch BuildRequires: boost-devel BuildRequires: cmake BuildRequires: doxygen BuildRequires: libconfuse-devel BuildRequires: libusbx-devel -BuildRequires: python-devel +BuildRequires: python2-devel BuildRequires: swig Requires: systemd @@ -62,6 +62,8 @@ for building C++ applications with libftdi. %prep %setup -q -n %{name}1-%{version} +%patch0 -p0 + #kernel does not provide usb_device anymore sed -i -e 's/usb_device/usb/g' packages/99-libftdi.rules sed -i -e 's/GROUP="plugdev"/TAG+="uaccess"/g' packages/99-libftdi.rules @@ -99,6 +101,8 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/serial_read rm -f $RPM_BUILD_ROOT/%{_bindir}/serial_test rm -rf $RPM_BUILD_ROOT/%{_libdir}/cmake* +rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf + %check #make check @@ -121,7 +125,7 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/cmake* %{_mandir}/man3/* %files python -%{python_sitearch}/* +%{python2_sitearch}/* %files c++ %{_libdir}/libftdipp1.so.2* @@ -138,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/cmake* %postun c++ -p /sbin/ldconfig %changelog +* Tue Jun 14 2016 Jon Ciesla 1.3-1 +- 1.3, libconfuse rebuild. + * Thu Feb 04 2016 Fedora Release Engineering - 1.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 2e89832..dde89c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -89dff802d89c4c0d55d8b4665fd52d0b libftdi1-1.2.tar.bz2 +156cdf40cece9f8a3ce1582db59a502a libftdi1-1.3.tar.bz2 From 60a5f3cf2630996693c0e66b5bc58f9c44fb8eb8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 07:39:04 +0000 Subject: [PATCH 55/79] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 61f8b3f..3952e9b 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,6 +1,6 @@ Name: libftdi Version: 1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -142,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf %postun c++ -p /sbin/ldconfig %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 1.3-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Tue Jun 14 2016 Jon Ciesla 1.3-1 - 1.3, libconfuse rebuild. From 067e46678d8ede459a0ea41664122bc6a31cdd18 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 27 Jan 2017 06:14:05 +0000 Subject: [PATCH 56/79] Rebuilt for Boost 1.63 --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 3952e9b..250030d 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,6 +1,6 @@ Name: libftdi Version: 1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -142,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf %postun c++ -p /sbin/ldconfig %changelog +* Fri Jan 27 2017 Jonathan Wakely - 1.3-3 +- Rebuilt for Boost 1.63 + * Tue Jul 19 2016 Fedora Release Engineering - 1.3-2 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From 29577670a239a15ae0b84e5d896f5a215a6375c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 18:40:44 +0000 Subject: [PATCH 57/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 250030d..7682d35 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,6 +1,6 @@ Name: libftdi Version: 1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -142,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf %postun c++ -p /sbin/ldconfig %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Jan 27 2017 Jonathan Wakely - 1.3-3 - Rebuilt for Boost 1.63 From 21156966b064f0fe203b5ce099bbd31af6e31b04 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 25 May 2017 08:00:18 -0500 Subject: [PATCH 58/79] libconfuse rebuild --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 7682d35..a9fbfa1 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,6 +1,6 @@ Name: libftdi Version: 1.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -142,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf %postun c++ -p /sbin/ldconfig %changelog +* Thu May 25 2017 Gwyn Ciesla 1.3-5 +- libconfuse rebuild. + * Fri Feb 10 2017 Fedora Release Engineering - 1.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 8813b8ef8a92fdfb38d71d3c51d4b2bc4df50dab Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 3 Jul 2017 21:30:10 +0100 Subject: [PATCH 59/79] Rebuilt for Boost 1.64 --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index a9fbfa1..a540070 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,6 +1,6 @@ Name: libftdi Version: 1.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -142,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf %postun c++ -p /sbin/ldconfig %changelog +* Mon Jul 03 2017 Jonathan Wakely - 1.3-6 +- Rebuilt for Boost 1.64 + * Thu May 25 2017 Gwyn Ciesla 1.3-5 - libconfuse rebuild. From b1a2eeb26ff240abeee2ce23a99ec1db7cc241c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 18:52:12 +0000 Subject: [PATCH 60/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index a540070..a6e4775 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,6 +1,6 @@ Name: libftdi Version: 1.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -142,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf %postun c++ -p /sbin/ldconfig %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Jul 03 2017 Jonathan Wakely - 1.3-6 - Rebuilt for Boost 1.64 From 6f6613a16c0420137a3f3fe4f76efad9eae17d42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 19 Aug 2017 09:38:34 -0400 Subject: [PATCH 61/79] Python 2 binary package renamed to python2-libftdi --- libftdi.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/libftdi.spec b/libftdi.spec index a6e4775..9a35c04 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,6 +1,6 @@ Name: libftdi Version: 1.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -32,12 +32,16 @@ Requires: pkgconfig %description devel Header files and static libraries for libftdi -%package python +%package -n python2-libftdi +%{?python_provide:%python_provide python2-libftdi} +# Remove before F30 +Provides: %{name}-python%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-python < %{version}-%{release} Summary: Libftdi library Python binding Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} -%description python +%description -n python2-libftdi Libftdi Python Language bindings. %package c++ @@ -124,7 +128,7 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf %{_libdir}/pkgconfig/libftdi1.pc %{_mandir}/man3/* -%files python +%files -n python2-libftdi %{python2_sitearch}/* %files c++ @@ -142,6 +146,10 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf %postun c++ -p /sbin/ldconfig %changelog +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.3-8 +- Python 2 binary package renamed to python2-libftdi + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + * Wed Jul 26 2017 Fedora Release Engineering - 1.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From e294c33cda932563841beb4fcaa9d14bcf3ffbeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 20 Aug 2017 10:35:57 -0400 Subject: [PATCH 62/79] Add Provides for the old name without %_isa --- libftdi.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 9a35c04..b2e6956 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,6 +1,6 @@ Name: libftdi Version: 1.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -35,6 +35,7 @@ Header files and static libraries for libftdi %package -n python2-libftdi %{?python_provide:%python_provide python2-libftdi} # Remove before F30 +Provides: %{name}-python = %{version}-%{release} Provides: %{name}-python%{?_isa} = %{version}-%{release} Obsoletes: %{name}-python < %{version}-%{release} Summary: Libftdi library Python binding @@ -146,6 +147,9 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf %postun c++ -p /sbin/ldconfig %changelog +* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 1.3-9 +- Add Provides for the old name without %%_isa + * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.3-8 - Python 2 binary package renamed to python2-libftdi See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 From 654187c77e2489b87dc300ac4e32b28af5a187a7 Mon Sep 17 00:00:00 2001 From: Troy Curtis Jr Date: Wed, 11 Oct 2017 03:37:28 +0000 Subject: [PATCH 63/79] Build the python3 bindings and add a subpackage for them. - Remove the CMakeLists patch file in favor of built-in CMake python library search configuration, which also allows building for both python3 and python2. - Add missing requires to -devel on the python bindings to ensure the included examples can be ran. - Do not include byte-compiled files for python scripts. --- libftdi-python-version.patch | 13 --------- libftdi.spec | 52 +++++++++++++++++++++++++++++++----- 2 files changed, 45 insertions(+), 20 deletions(-) delete mode 100644 libftdi-python-version.patch diff --git a/libftdi-python-version.patch b/libftdi-python-version.patch deleted file mode 100644 index b80bdae..0000000 --- a/libftdi-python-version.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- python/CMakeLists.txt~ 2016-05-20 01:53:12.000000000 -0500 -+++ python/CMakeLists.txt 2016-06-14 14:07:30.001554507 -0500 -@@ -12,8 +12,8 @@ - set ( SWIG_FOUND TRUE ) - endif () - endif () -- find_package ( PythonLibs ) -- find_package ( PythonInterp ) -+ find_package ( PythonLibs 2.7 REQUIRED ) -+ find_package ( PythonInterp 2.7 REQUIRED ) - endif () - - if ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND ) diff --git a/libftdi.spec b/libftdi.spec index b2e6956..3cc56f2 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,13 +1,12 @@ Name: libftdi Version: 1.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries License: LGPLv2 URL: http://www.intra2net.com/de/produkte/opensource/ftdi/ Source0: http://www.intra2net.com/en/developer/%{name}/download/%{name}1-%{version}.tar.bz2 -Patch0: libftdi-python-version.patch BuildRequires: boost-devel BuildRequires: cmake @@ -15,7 +14,9 @@ BuildRequires: doxygen BuildRequires: libconfuse-devel BuildRequires: libusbx-devel BuildRequires: python2-devel +BuildRequires: python3-devel BuildRequires: swig +BuildRequires: gcc-c++ Requires: systemd @@ -27,6 +28,7 @@ FT232BM and FT245BM type chips including the popular bitbang mode. Summary: Header files and static libraries for libftdi Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: python3-%{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig %description devel @@ -45,6 +47,15 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description -n python2-libftdi Libftdi Python Language bindings. +%package -n python3-libftdi +%{?python_provide:%python_provide python3-libftdi} +Summary: Libftdi library Python 3 binding +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description -n python3-libftdi +Libftdi Python 3 Language bindings. + %package c++ Summary: Libftdi library C++ binding Group: Development/Libraries @@ -67,21 +78,37 @@ for building C++ applications with libftdi. %prep %setup -q -n %{name}1-%{version} -%patch0 -p0 - #kernel does not provide usb_device anymore sed -i -e 's/usb_device/usb/g' packages/99-libftdi.rules sed -i -e 's/GROUP="plugdev"/TAG+="uaccess"/g' packages/99-libftdi.rules %build export CMAKE_PREFIX_PATH=/usr -%{cmake} . +mkdir build-py2 +pushd build-py2 +%{cmake} -DPython_ADDITIONAL_VERSIONS=%{python2_version} .. make %{?_smp_mflags} +popd +mkdir build-py3 +pushd build-py3 +%{cmake} -DPython_ADDITIONAL_VERSIONS=%{python3_version} .. +make %{?_smp_mflags} +popd + +# Fix python sheband lines +find python/examples -type f -exec sed -i '1s=^#!/usr/bin/\(python\|env python\)[23]\?=#!%{__python3}=' {} + %install +# Install python2, since we'll prefer python3 with the second install. +pushd build-py2 +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +popd + +pushd build-py3 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +popd mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.d/ install -p -m 644 packages/99-libftdi.rules $RPM_BUILD_ROOT/lib/udev/rules.d/69-libftdi.rules @@ -91,7 +118,7 @@ find $RPM_BUILD_ROOT -type f -name "*.a" -delete #no man install mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 -install -p -m 644 doc/man/man3/*.3 $RPM_BUILD_ROOT%{_mandir}/man3 +install -p -m 644 build-py3/doc/man/man3/*.3 $RPM_BUILD_ROOT%{_mandir}/man3 # Cleanup examples rm -f $RPM_BUILD_ROOT/%{_bindir}/simple @@ -120,7 +147,7 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf /lib/udev/rules.d/69-libftdi.rules %files devel -%doc doc/html +%doc build-py3/doc/html %doc %{_datadir}/libftdi/examples %{_bindir}/ftdi_eeprom %{_bindir}/libftdi1-config @@ -128,10 +155,16 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf %{_includedir}/libftdi1 %{_libdir}/pkgconfig/libftdi1.pc %{_mandir}/man3/* +# Don't include byte-compiled files for python scripts. +%exclude %{_datadir}/libftdi/examples/*.pyc +%exclude %{_datadir}/libftdi/examples/*.pyo %files -n python2-libftdi %{python2_sitearch}/* +%files -n python3-libftdi +%{python3_sitearch}/* + %files c++ %{_libdir}/libftdipp1.so.2* @@ -147,6 +180,11 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf %postun c++ -p /sbin/ldconfig %changelog +* Mon Oct 09 2017 Troy Curtis, Jr - 1.3-10 +- Add python3 subpackage. +- Drop patch0 in favor of built-in cmake config methods. +- Don't include bytecompiled files for the example python scripts. + * Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 1.3-9 - Add Provides for the old name without %%_isa From 38619904f1842beb192f92e3b25bf0b612e1d3ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 21:39:52 +0000 Subject: [PATCH 64/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 3cc56f2..a3d7df3 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,6 +1,6 @@ Name: libftdi Version: 1.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf %postun c++ -p /sbin/ldconfig %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Oct 09 2017 Troy Curtis, Jr - 1.3-10 - Add python3 subpackage. - Drop patch0 in favor of built-in cmake config methods. From abd653fee38920e45e9d034e18836ca908ea046b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Jun 2018 10:45:57 +0200 Subject: [PATCH 65/79] Rebuilt for Python 3.7 --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index a3d7df3..333177b 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,6 +1,6 @@ Name: libftdi Version: 1.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf %postun c++ -p /sbin/ldconfig %changelog +* Tue Jun 19 2018 Miro Hrončok - 1.3-12 +- Rebuilt for Python 3.7 + * Wed Feb 07 2018 Fedora Release Engineering - 1.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From ddba03d4fc74683cc428a2e6e0fd25b7b5a4a4c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 28 Jun 2018 14:09:15 +0200 Subject: [PATCH 66/79] Temporarily disable doxygen docs to workaround FTBFS --- libftdi.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libftdi.spec b/libftdi.spec index 333177b..4fb8c5d 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -10,7 +10,7 @@ Source0: http://www.intra2net.com/en/developer/%{name}/download/%{name}1-%{versi BuildRequires: boost-devel BuildRequires: cmake -BuildRequires: doxygen +#BuildRequires: doxygen BuildRequires: libconfuse-devel BuildRequires: libusbx-devel BuildRequires: python2-devel @@ -117,8 +117,8 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete find $RPM_BUILD_ROOT -type f -name "*.a" -delete #no man install -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 -install -p -m 644 build-py3/doc/man/man3/*.3 $RPM_BUILD_ROOT%{_mandir}/man3 +#mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 +#install -p -m 644 build-py3/doc/man/man3/*.3 $RPM_BUILD_ROOT%{_mandir}/man3 # Cleanup examples rm -f $RPM_BUILD_ROOT/%{_bindir}/simple @@ -147,14 +147,14 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf /lib/udev/rules.d/69-libftdi.rules %files devel -%doc build-py3/doc/html +#doc build-py3/doc/html %doc %{_datadir}/libftdi/examples %{_bindir}/ftdi_eeprom %{_bindir}/libftdi1-config %{_libdir}/libftdi1.so %{_includedir}/libftdi1 %{_libdir}/pkgconfig/libftdi1.pc -%{_mandir}/man3/* +#{_mandir}/man3/* # Don't include byte-compiled files for python scripts. %exclude %{_datadir}/libftdi/examples/*.pyc %exclude %{_datadir}/libftdi/examples/*.pyo @@ -182,6 +182,7 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf %changelog * Tue Jun 19 2018 Miro Hrončok - 1.3-12 - Rebuilt for Python 3.7 +- Temporarily disable doxygen docs to workaround FTBFS * Wed Feb 07 2018 Fedora Release Engineering - 1.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 2f2fa6aeb28a4e275532b0ef3865e7f07810486e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 28 Jun 2018 14:10:22 +0200 Subject: [PATCH 67/79] Revert "Temporarily disable doxygen docs to workaround FTBFS" This reverts commit ddba03d4fc74683cc428a2e6e0fd25b7b5a4a4c5. --- libftdi.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libftdi.spec b/libftdi.spec index 4fb8c5d..f56392f 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -10,7 +10,7 @@ Source0: http://www.intra2net.com/en/developer/%{name}/download/%{name}1-%{versi BuildRequires: boost-devel BuildRequires: cmake -#BuildRequires: doxygen +BuildRequires: doxygen BuildRequires: libconfuse-devel BuildRequires: libusbx-devel BuildRequires: python2-devel @@ -117,8 +117,8 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete find $RPM_BUILD_ROOT -type f -name "*.a" -delete #no man install -#mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 -#install -p -m 644 build-py3/doc/man/man3/*.3 $RPM_BUILD_ROOT%{_mandir}/man3 +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 +install -p -m 644 build-py3/doc/man/man3/*.3 $RPM_BUILD_ROOT%{_mandir}/man3 # Cleanup examples rm -f $RPM_BUILD_ROOT/%{_bindir}/simple @@ -147,14 +147,14 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf /lib/udev/rules.d/69-libftdi.rules %files devel -#doc build-py3/doc/html +%doc build-py3/doc/html %doc %{_datadir}/libftdi/examples %{_bindir}/ftdi_eeprom %{_bindir}/libftdi1-config %{_libdir}/libftdi1.so %{_includedir}/libftdi1 %{_libdir}/pkgconfig/libftdi1.pc -#{_mandir}/man3/* +%{_mandir}/man3/* # Don't include byte-compiled files for python scripts. %exclude %{_datadir}/libftdi/examples/*.pyc %exclude %{_datadir}/libftdi/examples/*.pyo From 06ce86353cc2bef26b19806668e37f4d74865f5f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 08:07:25 +0000 Subject: [PATCH 68/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index f56392f..79b848e 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,6 +1,6 @@ Name: libftdi Version: 1.3 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Library to program and control the FTDI USB controller Group: System Environment/Libraries @@ -180,6 +180,9 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf %postun c++ -p /sbin/ldconfig %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jun 19 2018 Miro Hrončok - 1.3-12 - Rebuilt for Python 3.7 - Temporarily disable doxygen docs to workaround FTBFS From 56c04a89e9a13d8db3594b51a8090322712abad4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:39:43 +0100 Subject: [PATCH 69/79] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- libftdi.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libftdi.spec b/libftdi.spec index 79b848e..a400776 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -173,11 +173,9 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf %{_includedir}/libftdi1/*hpp %{_libdir}/pkgconfig/libftdipp1.pc -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets -%post c++ -p /sbin/ldconfig -%postun c++ -p /sbin/ldconfig +%ldconfig_scriptlets c++ %changelog * Fri Jul 13 2018 Fedora Release Engineering - 1.3-13 From 7496013e50e695a294ac43e3283cb5479ac6d7c6 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:51 +0100 Subject: [PATCH 70/79] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- libftdi.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libftdi.spec b/libftdi.spec index a400776..a2aa3d0 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -3,7 +3,6 @@ Version: 1.3 Release: 13%{?dist} Summary: Library to program and control the FTDI USB controller -Group: System Environment/Libraries License: LGPLv2 URL: http://www.intra2net.com/de/produkte/opensource/ftdi/ Source0: http://www.intra2net.com/en/developer/%{name}/download/%{name}1-%{version}.tar.bz2 @@ -26,7 +25,6 @@ FT232BM and FT245BM type chips including the popular bitbang mode. %package devel Summary: Header files and static libraries for libftdi -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: python3-%{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig @@ -41,7 +39,6 @@ Provides: %{name}-python = %{version}-%{release} Provides: %{name}-python%{?_isa} = %{version}-%{release} Obsoletes: %{name}-python < %{version}-%{release} Summary: Libftdi library Python binding -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description -n python2-libftdi @@ -50,7 +47,6 @@ Libftdi Python Language bindings. %package -n python3-libftdi %{?python_provide:%python_provide python3-libftdi} Summary: Libftdi library Python 3 binding -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description -n python3-libftdi @@ -58,7 +54,6 @@ Libftdi Python 3 Language bindings. %package c++ Summary: Libftdi library C++ binding -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description c++ @@ -66,7 +61,6 @@ Libftdi library C++ language binding. %package c++-devel Summary: Libftdi library C++ binding development headers and libraries -Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-c++ = %{version}-%{release} From 51286118e8e21677d30b4ff2c1557ecfd7d1519e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 07:10:05 +0000 Subject: [PATCH 71/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index a2aa3d0..368c659 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,6 +1,6 @@ Name: libftdi Version: 1.3 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Library to program and control the FTDI USB controller License: LGPLv2 @@ -172,6 +172,9 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf %ldconfig_scriptlets c++ %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.3-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 00e5ee125f59b0d380bbed5630793e7db18e15e5 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 17 Feb 2019 08:55:59 -0600 Subject: [PATCH 72/79] Add patch to deal with change in CMake/SWIG behavior. --- libftdi-cmake_swig.patch | 21 +++++++++++++++++++++ libftdi.spec | 26 ++++++++++++++++++++------ 2 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 libftdi-cmake_swig.patch diff --git a/libftdi-cmake_swig.patch b/libftdi-cmake_swig.patch new file mode 100644 index 0000000..749f12a --- /dev/null +++ b/libftdi-cmake_swig.patch @@ -0,0 +1,21 @@ +--- a/python/CMakeLists.txt ++++ b/python/CMakeLists.txt +@@ -1,3 +1,7 @@ ++# swig_add_module is depreceated and SWIG_MODULE__REAL_NAME is no ++# longer set by default so set policy to the old behavior. ++cmake_policy(SET CMP0078 OLD) ++ + option ( PYTHON_BINDINGS "Build python bindings via swig" ON ) + option ( LINK_PYTHON_LIBRARY "Link against python libraries" ON ) + +@@ -24,8 +28,9 @@ if ( SWIG_FOUND AND PYTHONLIBS_FOUND AND + + if ( DOCUMENTATION AND DOXYGEN_FOUND ) + set(CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND}) ++ set_property(SOURCE ftdi1.i PROPERTY DEPENDS ftdi1_doc.i) + endif() +- swig_add_module ( ftdi1 python ftdi1.i ) ++ swig_add_library ( ftdi1 LANGUAGE python SOURCES ftdi1.i ) + swig_link_libraries ( ftdi1 ftdi1 ) + + if ( LINK_PYTHON_LIBRARY ) diff --git a/libftdi.spec b/libftdi.spec index 368c659..64a7704 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,21 +1,25 @@ Name: libftdi Version: 1.3 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Library to program and control the FTDI USB controller License: LGPLv2 URL: http://www.intra2net.com/de/produkte/opensource/ftdi/ Source0: http://www.intra2net.com/en/developer/%{name}/download/%{name}1-%{version}.tar.bz2 -BuildRequires: boost-devel -BuildRequires: cmake +# Swig requirements have changed in newer versions of CMake. +# This should be sent upstream. +Patch0: libftdi-cmake_swig.patch + +BuildRequires: cmake gcc-c++ BuildRequires: doxygen +BuildRequires: boost-devel BuildRequires: libconfuse-devel BuildRequires: libusbx-devel BuildRequires: python2-devel BuildRequires: python3-devel BuildRequires: swig -BuildRequires: gcc-c++ + Requires: systemd @@ -32,6 +36,7 @@ Requires: pkgconfig %description devel Header files and static libraries for libftdi + %package -n python2-libftdi %{?python_provide:%python_provide python2-libftdi} # Remove before F30 @@ -44,6 +49,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description -n python2-libftdi Libftdi Python Language bindings. + %package -n python3-libftdi %{?python_provide:%python_provide python3-libftdi} Summary: Libftdi library Python 3 binding @@ -52,6 +58,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description -n python3-libftdi Libftdi Python 3 Language bindings. + %package c++ Summary: Libftdi library C++ binding Requires: %{name}%{?_isa} = %{version}-%{release} @@ -59,6 +66,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description c++ Libftdi library C++ language binding. + %package c++-devel Summary: Libftdi library C++ binding development headers and libraries Requires: %{name}-devel = %{version}-%{release} @@ -70,12 +78,13 @@ for building C++ applications with libftdi. %prep -%setup -q -n %{name}1-%{version} +%autosetup -p1 -n %{name}1-%{version} #kernel does not provide usb_device anymore sed -i -e 's/usb_device/usb/g' packages/99-libftdi.rules sed -i -e 's/GROUP="plugdev"/TAG+="uaccess"/g' packages/99-libftdi.rules + %build export CMAKE_PREFIX_PATH=/usr @@ -94,6 +103,7 @@ popd # Fix python sheband lines find python/examples -type f -exec sed -i '1s=^#!/usr/bin/\(python\|env python\)[23]\?=#!%{__python3}=' {} + + %install # Install python2, since we'll prefer python3 with the second install. pushd build-py2 @@ -129,12 +139,12 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/cmake* rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf + %check #make check %files -%{!?_licensedir:%global license %%doc} %license COPYING.LIB %doc AUTHORS ChangeLog README %{_libdir}/libftdi1.so.2* @@ -171,7 +181,11 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf %ldconfig_scriptlets c++ + %changelog +* Sun Feb 17 2019 Richard Shaw - 1.3-1 +- Add patch to deal with change in CMake/SWIG behavior. + * Fri Feb 01 2019 Fedora Release Engineering - 1.3-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 1ed7a06634818383efceedb1c00acabeb8ecd681 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 17 Feb 2019 09:05:44 -0600 Subject: [PATCH 73/79] Update comments that the problem and fix have been reported to upstream's mailing list. --- libftdi-cmake_swig.patch | 2 +- libftdi.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libftdi-cmake_swig.patch b/libftdi-cmake_swig.patch index 749f12a..bbbdd46 100644 --- a/libftdi-cmake_swig.patch +++ b/libftdi-cmake_swig.patch @@ -1,7 +1,7 @@ --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -1,3 +1,7 @@ -+# swig_add_module is depreceated and SWIG_MODULE__REAL_NAME is no ++# swig_add_module is deprecated and SWIG_MODULE__REAL_NAME is no +# longer set by default so set policy to the old behavior. +cmake_policy(SET CMP0078 OLD) + diff --git a/libftdi.spec b/libftdi.spec index 64a7704..6dfce8f 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -8,7 +8,7 @@ URL: http://www.intra2net.com/de/produkte/opensource/ftdi/ Source0: http://www.intra2net.com/en/developer/%{name}/download/%{name}1-%{version}.tar.bz2 # Swig requirements have changed in newer versions of CMake. -# This should be sent upstream. +# This has been reported to the mailing list Patch0: libftdi-cmake_swig.patch BuildRequires: cmake gcc-c++ From e9272eadaaf45fd474cc3075e3700b827014c875 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 26 Feb 2019 07:54:16 -0600 Subject: [PATCH 74/79] Remove python2 subpackage per RHBZ#1634583. --- libftdi.spec | 71 ++++++++++++++++------------------------------------ 1 file changed, 21 insertions(+), 50 deletions(-) diff --git a/libftdi.spec b/libftdi.spec index 6dfce8f..06ebe7f 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -16,7 +16,6 @@ BuildRequires: doxygen BuildRequires: boost-devel BuildRequires: libconfuse-devel BuildRequires: libusbx-devel -BuildRequires: python2-devel BuildRequires: python3-devel BuildRequires: swig @@ -37,19 +36,6 @@ Requires: pkgconfig Header files and static libraries for libftdi -%package -n python2-libftdi -%{?python_provide:%python_provide python2-libftdi} -# Remove before F30 -Provides: %{name}-python = %{version}-%{release} -Provides: %{name}-python%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python < %{version}-%{release} -Summary: Libftdi library Python binding -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description -n python2-libftdi -Libftdi Python Language bindings. - - %package -n python3-libftdi %{?python_provide:%python_provide python3-libftdi} Summary: Libftdi library Python 3 binding @@ -88,16 +74,9 @@ sed -i -e 's/GROUP="plugdev"/TAG+="uaccess"/g' packages/99-libftdi.rules %build export CMAKE_PREFIX_PATH=/usr -mkdir build-py2 -pushd build-py2 -%{cmake} -DPython_ADDITIONAL_VERSIONS=%{python2_version} .. -make %{?_smp_mflags} -popd - -mkdir build-py3 -pushd build-py3 +mkdir build-py3 && pushd build-py3 %{cmake} -DPython_ADDITIONAL_VERSIONS=%{python3_version} .. -make %{?_smp_mflags} +%make_build %{?_smp_mflags} popd # Fix python sheband lines @@ -105,39 +84,34 @@ find python/examples -type f -exec sed -i '1s=^#!/usr/bin/\(python\|env python\) %install -# Install python2, since we'll prefer python3 with the second install. -pushd build-py2 -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" -popd - pushd build-py3 -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +%make_install popd -mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.d/ -install -p -m 644 packages/99-libftdi.rules $RPM_BUILD_ROOT/lib/udev/rules.d/69-libftdi.rules +mkdir -p %{buildroot}/lib/udev/rules.d/ +install -pm 0644 packages/99-libftdi.rules %{buildroot}/lib/udev/rules.d/69-libftdi.rules -find $RPM_BUILD_ROOT -type f -name "*.la" -delete -find $RPM_BUILD_ROOT -type f -name "*.a" -delete +find %{buildroot} -type f -name "*.la" -delete +find %{buildroot} -type f -name "*.a" -delete #no man install -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 -install -p -m 644 build-py3/doc/man/man3/*.3 $RPM_BUILD_ROOT%{_mandir}/man3 +mkdir -p %{buildroot}%{_mandir}/man3 +install -pm 0644 build-py3/doc/man/man3/*.3 %{buildroot}%{_mandir}/man3 # Cleanup examples -rm -f $RPM_BUILD_ROOT/%{_bindir}/simple -rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang -rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang2 -rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang_ft2232 -rm -f $RPM_BUILD_ROOT/%{_bindir}/bitbang_cbus -rm -f $RPM_BUILD_ROOT/%{_bindir}/find_all -rm -f $RPM_BUILD_ROOT/%{_bindir}/find_all_pp -rm -f $RPM_BUILD_ROOT/%{_bindir}/baud_test -rm -f $RPM_BUILD_ROOT/%{_bindir}/serial_read -rm -f $RPM_BUILD_ROOT/%{_bindir}/serial_test -rm -rf $RPM_BUILD_ROOT/%{_libdir}/cmake* +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}/baud_test +rm -f %{buildroot}%{_bindir}/serial_read +rm -f %{buildroot}%{_bindir}/serial_test +rm -rf %{buildroot}%{_libdir}/cmake* -rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf +rm -rf %{buildroot}%{_datadir}/doc/libftdi1/example.conf %check @@ -163,9 +137,6 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/libftdi1/example.conf %exclude %{_datadir}/libftdi/examples/*.pyc %exclude %{_datadir}/libftdi/examples/*.pyo -%files -n python2-libftdi -%{python2_sitearch}/* - %files -n python3-libftdi %{python3_sitearch}/* From b2cd321e404547933bb518018adcbcfa5f9ac60f Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 26 Feb 2019 08:12:48 -0600 Subject: [PATCH 75/79] Rebuild to drop python2 subpackage per RHBZ#1634583. --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 06ebe7f..b4b214a 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,6 +1,6 @@ Name: libftdi Version: 1.3 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Library to program and control the FTDI USB controller License: LGPLv2 @@ -154,6 +154,9 @@ rm -rf %{buildroot}%{_datadir}/doc/libftdi1/example.conf %changelog +* Tue Feb 26 2019 Richard Shaw - 1.3-16 +- Rebuild to drop python2 subpackage per RHBZ#1634583. + * Sun Feb 17 2019 Richard Shaw - 1.3-1 - Add patch to deal with change in CMake/SWIG behavior. From 2f67d33b24609e38dd168511f237a05f85587d8e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 13:17:52 +0000 Subject: [PATCH 76/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index b4b214a..4c12be4 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,6 +1,6 @@ Name: libftdi Version: 1.3 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Library to program and control the FTDI USB controller License: LGPLv2 @@ -154,6 +154,9 @@ rm -rf %{buildroot}%{_datadir}/doc/libftdi1/example.conf %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.3-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Feb 26 2019 Richard Shaw - 1.3-16 - Rebuild to drop python2 subpackage per RHBZ#1634583. From d9d6245e783d06ca1865df7aa80c068e9d62a5b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 10:17:45 +0200 Subject: [PATCH 77/79] Rebuilt for Python 3.8 --- libftdi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 4c12be4..1193a96 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,6 +1,6 @@ Name: libftdi Version: 1.3 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Library to program and control the FTDI USB controller License: LGPLv2 @@ -154,6 +154,9 @@ rm -rf %{buildroot}%{_datadir}/doc/libftdi1/example.conf %changelog +* Mon Aug 19 2019 Miro Hrončok - 1.3-18 +- Rebuilt for Python 3.8 + * Thu Jul 25 2019 Fedora Release Engineering - 1.3-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 5d6bd884bfca723975f91bff47d1ee7e54dad6f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Sat, 3 Aug 2019 14:28:12 +0200 Subject: [PATCH 78/79] Update to 1.4 --- libftdi.spec | 14 +++++++------- sources | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libftdi.spec b/libftdi.spec index 1193a96..6fa8d69 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,6 +1,6 @@ Name: libftdi -Version: 1.3 -Release: 18%{?dist} +Version: 1.4 +Release: 1%{?dist} Summary: Library to program and control the FTDI USB controller License: LGPLv2 @@ -66,8 +66,7 @@ for building C++ applications with libftdi. %prep %autosetup -p1 -n %{name}1-%{version} -#kernel does not provide usb_device anymore -sed -i -e 's/usb_device/usb/g' packages/99-libftdi.rules +# switch to uaccess control sed -i -e 's/GROUP="plugdev"/TAG+="uaccess"/g' packages/99-libftdi.rules @@ -133,15 +132,13 @@ rm -rf %{buildroot}%{_datadir}/doc/libftdi1/example.conf %{_includedir}/libftdi1 %{_libdir}/pkgconfig/libftdi1.pc %{_mandir}/man3/* -# Don't include byte-compiled files for python scripts. -%exclude %{_datadir}/libftdi/examples/*.pyc -%exclude %{_datadir}/libftdi/examples/*.pyo %files -n python3-libftdi %{python3_sitearch}/* %files c++ %{_libdir}/libftdipp1.so.2* +%{_libdir}/libftdipp1.so.3 %files c++-devel %{_libdir}/libftdipp1.so @@ -154,6 +151,9 @@ rm -rf %{buildroot}%{_datadir}/doc/libftdi1/example.conf %changelog +* Sat Aug 03 2019 Dan Horák - 1.4-1 +- Update to 1.4 + * Mon Aug 19 2019 Miro Hrončok - 1.3-18 - Rebuilt for Python 3.8 diff --git a/sources b/sources index dde89c7..82d8085 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -156cdf40cece9f8a3ce1582db59a502a libftdi1-1.3.tar.bz2 +SHA512 (libftdi1-1.4.tar.bz2) = dbab74f7bc35ca835b9c6dd5b70a64816948d65da1f73a9ece37a0f0f630bd0df1a676543acc517b02a718bc34ba4f7a30cbc48b6eed1c154c917f8ef0a358fc From 006dbcbaaec4906177c39e2dd50a2cffd0db577f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 9 Sep 2019 18:18:19 +0200 Subject: [PATCH 79/79] bump changelog date to make it ordered correctly --- libftdi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 6fa8d69..3a07ff3 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -151,7 +151,7 @@ rm -rf %{buildroot}%{_datadir}/doc/libftdi1/example.conf %changelog -* Sat Aug 03 2019 Dan Horák - 1.4-1 +* Mon Sep 09 2019 Dan Horák - 1.4-1 - Update to 1.4 * Mon Aug 19 2019 Miro Hrončok - 1.3-18