From 04315bae3db85da2c1246d11485747f6fda4e647 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 14 Jun 2016 14:25:18 -0500 Subject: [PATCH] 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