$ git diff --patch-with-stat --summary 02dd8861e7d2eccece3839ee64e299c84682ba9f..105d4fae817a1910e76d015f896e4c68b9d52903
0001-include-algorithm-so-std-sort-is-found.patch | 24 +++++++++++++++++++++++
kicad.spec | 17 ++++++++++------
2 files changed, 35 insertions(+), 6 deletions(-)
create mode 100644 0001-include-algorithm-so-std-sort-is-found.patch
diff --git a/0001-include-algorithm-so-std-sort-is-found.patch b/0001-include-algorithm-so-std-sort-is-found.patch
new file mode 100644
index 0000000..3f8bec0
--- /dev/null
+++ b/0001-include-algorithm-so-std-sort-is-found.patch
@@ -0,0 +1,24 @@
+From 970f52c2e310c3daf9bed40aa676835431e803b0 Mon Sep 17 00:00:00 2001
+From: emC5RgViIK <gitlab.com@online.posch.name>
+Date: Mon, 11 May 2020 16:23:04 +0000
+Subject: [PATCH] #include <algorithm> so std::sort is found.
+
+---
+ common/lib_tree_model.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/common/lib_tree_model.cpp b/common/lib_tree_model.cpp
+index 71fe74c7d..ed30b11de 100644
+--- a/common/lib_tree_model.cpp
++++ b/common/lib_tree_model.cpp
+@@ -21,6 +21,7 @@
+
+ #include <lib_tree_model.h>
+
++#include <algorithm>
+ #include <eda_pattern_match.h>
+ #include <lib_tree_item.h>
+ #include <make_unique.h>
+--
+2.26.2
+
diff --git a/kicad.spec b/kicad.spec
index 21249d3..3608424 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -16,7 +16,7 @@
Name: kicad
Summary: An open source program for the creation of electronic schematic diagrams
Version: 5.1.5
-Release: 1
+Release: 2
# git clone https://github.com/KiCad/kicad-source-mirror.git
# pushd kicad-source-mirror
# git archive --format=tar --prefix %{name}-%{version}-$(date +%Y%m%d)/ HEAD | xz -vf > ../%{name}-%{version}-$(date +%Y%m%d).tar.xz
@@ -27,6 +27,7 @@ Source2: https://github.com/KiCad/%{tempname}/archive/%{version}.tar.gz#%{tempna
Source3: https://github.com/KiCad/%{symname}/archive/%{version}.tar.gz#%{symname}-%{version}.tar.gz
Source4: https://github.com/KiCad/%{footname}/archive/%{version}.tar.gz#%{footname}-%{version}.tar.gz
Source5: https://github.com/KiCad/%{i18nname}/archive/%{version}.tar.gz#%{i18nname}-%{version}.tar.gz
+Patch1: 0001-include-algorithm-so-std-sort-is-found.patch
Source100: kicad.rpmlintrc
License: GPLv2+
@@ -39,16 +40,17 @@ BuildRequires: imagemagick
BuildRequires: boost-devel
BuildRequires: glew-devel
BuildRequires: cairo-devel
-BuildRequires: openssl-devel
+BuildRequires: pkgconfig(openssl)
BuildRequires: gomp-devel
BuildRequires: cmake
BuildRequires: pkgconfig(glm)
BuildRequires: pkgconfig(ngspice)
-BuildRequires: pkgconfig(python2)
+BuildRequires: pkgconfig(python3)
BuildRequires: pkgconfig(sm)
BuildRequires: curl-devel
BuildRequires: opencascade-devel
-BuildRequires: wxPythonGTK-devel >= 3.0
+BuildRequires: python3dist(wxpython)
+BuildRequires: python-sip4-wx
BuildRequires: source-highlight
BuildRequires: doxygen
@@ -59,6 +61,7 @@ BuildRequires: a2x
BuildRequires: perl(Unicode::GCString)
BuildRequires: swig
Requires: %{docname}
+Requires: python3dist(wxpython)
%description
Kicad is an open source (GPL) program for the creation of electronic
@@ -98,12 +101,12 @@ Kicad-library is a set of library needed by kicad.
%prep
%setup -q -T -b 0 -n %{name}-source-mirror-%{version}
+%patch1 -p1
%setup -q -T -b 1 -n %{docname}-%{version}
%setup -q -T -b 2 -n %{tempname}-%{version}
%setup -q -T -b 3 -n %{symname}-%{version}
%setup -q -T -b 4 -n %{footname}-%{version}
%setup -q -T -b 5 -n %{i18nname}-%{version}
-
cd ..
# proper libname policy
@@ -136,6 +139,8 @@ pushd %{name}-source-mirror-%{version}
-DBUILD_SHARED_LIBS:BOOL=OFF \
-DKICAD_STABLE_VERSION:BOOL=ON \
-DKICAD_wxUSE_UNICODE=ON \
+ -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON \
+ -DKICAD_SCRIPTING_PYTHON3=ON \
-DCMAKE_BUILD_TYPE=Release \
-DKICAD_SKIP_BOOST=ON \
-DKICAD_REPO_NAME=stable \
@@ -241,7 +246,7 @@ popd
%{_datadir}/%{name}/scripting
%{_libdir}/%{name}
%{_datadir}/appdata/*.xml
-%{py2_puresitedir}/*
+%{py3_puresitedir}/*
%{_libdir}/*.so*
%files doc