From 202d2fec5d2f11c5fca5eed53fb58a48d6bbec57 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 13 Sep 2019 16:59:36 +0100 Subject: [PATCH 1/3] remove smp_mflags from make_build, the make_build macro does it --- libftdi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 3a07ff3..5a77f51 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -75,7 +75,7 @@ export CMAKE_PREFIX_PATH=/usr mkdir build-py3 && pushd build-py3 %{cmake} -DPython_ADDITIONAL_VERSIONS=%{python3_version} .. -%make_build %{?_smp_mflags} +%make_build popd # Fix python sheband lines From 388db56f5065c83e0a7039c9209635a80b3a9330 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 13 Sep 2019 17:01:16 +0100 Subject: [PATCH 2/3] Use %{_prefix} instead of /usr --- libftdi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libftdi.spec b/libftdi.spec index 5a77f51..96101e5 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -71,7 +71,7 @@ sed -i -e 's/GROUP="plugdev"/TAG+="uaccess"/g' packages/99-libftdi.rules %build -export CMAKE_PREFIX_PATH=/usr +export CMAKE_PREFIX_PATH=%{_prefix} mkdir build-py3 && pushd build-py3 %{cmake} -DPython_ADDITIONAL_VERSIONS=%{python3_version} .. From e0a2ce10a9ac96efa2e0aeaeb86a4516a5d88566 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 13 Sep 2019 17:03:59 +0100 Subject: [PATCH 3/3] Remove requires pkgconfig and use buildrequires cmake3 --- libftdi.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libftdi.spec b/libftdi.spec index 96101e5..8d8bc79 100644 --- a/libftdi.spec +++ b/libftdi.spec @@ -11,7 +11,7 @@ Source0: http://www.intra2net.com/en/developer/%{name}/download/%{name}1-%{versi # This has been reported to the mailing list Patch0: libftdi-cmake_swig.patch -BuildRequires: cmake gcc-c++ +BuildRequires: cmake3 gcc-c++ BuildRequires: doxygen BuildRequires: boost-devel BuildRequires: libconfuse-devel @@ -30,7 +30,6 @@ 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: pkgconfig %description devel Header files and static libraries for libftdi @@ -74,7 +73,7 @@ sed -i -e 's/GROUP="plugdev"/TAG+="uaccess"/g' packages/99-libftdi.rules export CMAKE_PREFIX_PATH=%{_prefix} mkdir build-py3 && pushd build-py3 -%{cmake} -DPython_ADDITIONAL_VERSIONS=%{python3_version} .. +%{cmake3} -DPython_ADDITIONAL_VERSIONS=%{python3_version} .. %make_build popd