diff --git a/libftdi-cmake_swig.patch b/libftdi-cmake_swig.patch deleted file mode 100644 index bbbdd46..0000000 --- a/libftdi-cmake_swig.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/python/CMakeLists.txt -+++ b/python/CMakeLists.txt -@@ -1,3 +1,7 @@ -+# 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) -+ - 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 705f05e..e19c49e 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -1,25 +1,23 @@ Name: libftdi -Version: 1.4 -Release: 10%{?dist} +Version: 1.5 +Release: 1%{?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 +URL: https://www.intra2net.com/en/developer/libftdi/ +Source0: https://www.intra2net.com/en/developer/%{name}/download/%{name}1-%{version}.tar.bz2 -# Swig requirements have changed in newer versions of CMake. -# This has been reported to the mailing list -Patch0: libftdi-cmake_swig.patch - -BuildRequires: cmake3 gcc-c++ +BuildRequires: cmake +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: doxygen BuildRequires: boost-devel BuildRequires: libconfuse-devel BuildRequires: libusbx-devel +BuildRequires: make BuildRequires: python3-devel BuildRequires: swig -BuildRequires: make - +BuildRequires: systemd Requires: systemd @@ -31,6 +29,7 @@ FT232BM and FT245BM type chips including the popular bitbang mode. Summary: Header files and static libraries for libftdi Requires: %{name}%{?_isa} = %{version}-%{release} Requires: python3-%{name}%{?_isa} = %{version}-%{release} +Requires: cmake-filesystem %description devel Header files and static libraries for libftdi @@ -71,32 +70,17 @@ sed -i -e 's/GROUP="plugdev"/TAG+="uaccess"/g' packages/99-libftdi.rules %build -export CMAKE_PREFIX_PATH=%{_prefix} - -mkdir build-py3 && pushd build-py3 -%{cmake3} -DPython_ADDITIONAL_VERSIONS=%{python3_version} .. -B . -%make_build -popd - -# Fix python sheband lines -find python/examples -type f -exec sed -i '1s=^#!/usr/bin/\(python\|env python\)[23]\?=#!%{__python3}=' {} + - +%cmake -DSTATICLIBS=off -DFTDIPP=on -DPYTHON_BINDINGS=on -DDOCUMENTATION=on . +%cmake_build %install -pushd build-py3 -%make_install -popd +%cmake_install + +install -D -pm 0644 packages/99-libftdi.rules %{buildroot}%{_udevrulesdir}/69-libftdi.rules mkdir -p %{buildroot}/usr/lib/udev/rules.d/ install -pm 0644 packages/99-libftdi.rules %{buildroot}/usr/lib/udev/rules.d/69-libftdi.rules -find %{buildroot} -type f -name "*.la" -delete -find %{buildroot} -type f -name "*.a" -delete - -#no man install -mkdir -p %{buildroot}%{_mandir}/man3 -install -pm 0644 build-py3/doc/man/man3/*.3 %{buildroot}%{_mandir}/man3 - # Cleanup examples rm -f %{buildroot}%{_bindir}/simple rm -f %{buildroot}%{_bindir}/bitbang @@ -108,9 +92,9 @@ 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 %{buildroot}%{_datadir}/doc/libftdi1/example.conf +rm -f %{buildroot}%{_datadir}/doc/libftdi1/example.conf +rm -f %{buildroot}%{_datadir}/doc/libftdipp1/example.conf %check @@ -119,19 +103,18 @@ rm -rf %{buildroot}%{_datadir}/doc/libftdi1/example.conf %files %license COPYING.LIB -%doc AUTHORS ChangeLog README %{_libdir}/libftdi1.so.2* -/usr/lib/udev/rules.d/69-libftdi.rules +%{_udevrulesdir}/69-libftdi.rules %files devel -%doc build-py3/doc/html +%doc AUTHORS ChangeLog %doc %{_datadir}/libftdi/examples %{_bindir}/ftdi_eeprom %{_bindir}/libftdi1-config -%{_libdir}/libftdi1.so %{_includedir}/libftdi1 +%{_libdir}/libftdi1.so %{_libdir}/pkgconfig/libftdi1.pc -%{_mandir}/man3/* +%{_libdir}/cmake/libftdi1/ %files -n python3-libftdi %{python3_sitearch}/* @@ -142,15 +125,17 @@ rm -rf %{buildroot}%{_datadir}/doc/libftdi1/example.conf %files c++-devel %{_libdir}/libftdipp1.so -%{_includedir}/libftdi1/*hpp +%{_includedir}/libftdipp1/*hpp %{_libdir}/pkgconfig/libftdipp1.pc %ldconfig_scriptlets %ldconfig_scriptlets c++ - %changelog +* Sun Aug 15 2021 Peter Robinson - 1.5-1 +- Update to 1.5 + * Thu Jul 22 2021 Fedora Release Engineering - 1.4-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 82d8085..bdbd52c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libftdi1-1.4.tar.bz2) = dbab74f7bc35ca835b9c6dd5b70a64816948d65da1f73a9ece37a0f0f630bd0df1a676543acc517b02a718bc34ba4f7a30cbc48b6eed1c154c917f8ef0a358fc +SHA512 (libftdi1-1.5.tar.bz2) = c525b2ab6aff9ef9254971ae7d57f3549a36a36875765c48f947d52532814a2a004de1232389d4fe824a8c8ab84277b08427308573476e1da9b7db83db802f6f