From 1587f49d379f43d28154ed15cbf20dba14c1ba40 Mon Sep 17 00:00:00 2001 From: Steven A. Falco Date: Sep 26 2020 20:11:29 +0000 Subject: Update to 5.1.7 --- diff --git a/.gitignore b/.gitignore index 0e36968..0394aa4 100644 --- a/.gitignore +++ b/.gitignore @@ -807,3 +807,10 @@ kicad-libraries-2010.05.27.tar.bz2 /kicad-packages3D-5.1.6.tar.gz /kicad-symbols-5.1.6.tar.gz /kicad-templates-5.1.6.tar.gz +/kicad-5.1.7.tar.bz2 +/kicad-doc-5.1.7.tar.bz2 +/kicad-i18n-5.1.7.tar.bz2 +/kicad-footprints-5.1.7.tar.gz +/kicad-packages3D-5.1.7.tar.gz +/kicad-symbols-5.1.7.tar.gz +/kicad-templates-5.1.7.tar.gz diff --git a/0001-include-algorithm-so-std-sort-is-found.patch b/0001-include-algorithm-so-std-sort-is-found.patch deleted file mode 100644 index 3f8bec0..0000000 --- a/0001-include-algorithm-so-std-sort-is-found.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 970f52c2e310c3daf9bed40aa676835431e803b0 Mon Sep 17 00:00:00 2001 -From: emC5RgViIK -Date: Mon, 11 May 2020 16:23:04 +0000 -Subject: [PATCH] #include 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 - -+#include - #include - #include - #include --- -2.26.2 - diff --git a/kicad.spec b/kicad.spec index f80a4a6..d9d7ea6 100644 --- a/kicad.spec +++ b/kicad.spec @@ -1,6 +1,6 @@ Name: kicad -Version: 5.1.6 -Release: 6%{?dist} +Version: 5.1.7 +Release: 1%{?dist} Epoch: 1 Summary: EDA software suite for creation of schematic diagrams and PCBs @@ -16,9 +16,6 @@ Source5: https://github.com/KiCad/kicad-footprints/archive/%{version}.tar Source6: https://github.com/KiCad/kicad-packages3D/archive/%{version}.tar.gz#/kicad-packages3D-%{version}.tar.gz Patch1: 0001-Do-not-strip-executables.patch -Patch2: 0001-include-algorithm-so-std-sort-is-found.patch -# Add compatibility for Python 3.9 -Patch3: python-3.9-compat.patch # kicad is only available on the following architectures (see https://bugs.launchpad.net/kicad/+bug/1755752): ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le @@ -97,8 +94,6 @@ Documentation for KiCad. %setup -q -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build @@ -240,6 +235,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata %changelog +* Sat Sep 26 2020 Steven A. Falco - 1:5.1.7-1 +- Update to 5.1.7 + * Tue Jul 28 2020 Fedora Release Engineering - 1:5.1.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/python-3.9-compat.patch b/python-3.9-compat.patch deleted file mode 100644 index ff5eeda..0000000 --- a/python-3.9-compat.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeModules/FindPythonLibs.cmake b/CMakeModules/FindPythonLibs.cmake -index 158df7bb..48bc46f1 100644 ---- a/CMakeModules/FindPythonLibs.cmake -+++ b/CMakeModules/FindPythonLibs.cmake -@@ -44,7 +44,7 @@ cmake_find_frameworks(Python) - - set(_PYTHON1_VERSIONS 1.6 1.5) - set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) --set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -+set(_PYTHON3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - - if(PythonLibs_FIND_VERSION) - if(PythonLibs_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$") diff --git a/sources b/sources index 2f73aea..c7fe77b 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -SHA512 (kicad-5.1.6.tar.bz2) = 4fd3d0ac1524cc113210be8dc1b76ab4e02bf271f598943ecab73af98a9dc99009b2d3818c97b358498d2f98ee863f13b21e958fd2143356c2a1368601f0d48a -SHA512 (kicad-doc-5.1.6.tar.bz2) = 6fae707154aa662689c5da03696d30ebc7442a6d2706cb14d470e91675d0f77c3eb9dd716d29b1eccde5cb0ff39a582a497be2d65d5e34e40defe2fdf97093e0 -SHA512 (kicad-i18n-5.1.6.tar.bz2) = 58b213845de9359124e98df1e6bed4df3184da2fe075a1751fe4c9861084748853fd258ecf2d99849ca07a3c84d99657158d9168caf6ac5eaa9884b10dd9ca91 -SHA512 (kicad-footprints-5.1.6.tar.gz) = da0fa31b56da1210f9bbdd0719ba7b9fe642170a8093dc3411ee3bed1f24ebcc2a14e7aee314a7dcbb80c453ea72a44f7acb34e44814d0d52aeb78eeb1227ec6 -SHA512 (kicad-packages3D-5.1.6.tar.gz) = 248fb4a759c7824d17b8a955f0636ed266e404a783af9a684ae09b8d2efc8871851c5236caf4092a97ba0485a9c3962bdea1898658aa17d6503832348b1968a9 -SHA512 (kicad-symbols-5.1.6.tar.gz) = e090cbafe3cffea86ccfda18d521528bededb573af7a46d5e7af0047a8c70f553e11e56046ec26ea11f742031507ab1ddd99459488f7ee57d8a18d6b9a5249ed -SHA512 (kicad-templates-5.1.6.tar.gz) = cd0d539322e8c4fe9787d68bf2d7c1e5a287824aacd89edff77e1531052664669ce1193f58f5e992ff28183afadcf14c080c9ff407247f0b3d6c12366b4d4b0d +SHA512 (kicad-5.1.7.tar.bz2) = f853eed50245d875b2443cc9accb3c75e8404d8fee12f129df68b3ab7052c31cda1eb0ad22fc10eb23b35250188973fb51a8c55fcb1560ea65d6e5e22b94a182 +SHA512 (kicad-doc-5.1.7.tar.bz2) = 72dcfdf3d943dc73bb4f30c9dc9f0cfe7a0c3f8749a04b04624c47e2b69f6be29627e2768d008980ae9ac691aa56c97529edc15741c72e261e4c2c6f3e7b32b4 +SHA512 (kicad-i18n-5.1.7.tar.bz2) = 1877c28bffd0d29a32867fe2aa5eb1e24df4ab4c36c381976d712d2319e4b6049cfb91f26d1158cd2ba08eab63a7da12701532fe6207b8aa9c4470c951788fa0 +SHA512 (kicad-footprints-5.1.7.tar.gz) = c21bb6e65b1e5d332d75bf2bcdf34da03a4f5301a1d8458da3780dc52099f536579a99a139925de33b2c57983043305dabbb80be3bef207461dbc42458281252 +SHA512 (kicad-packages3D-5.1.7.tar.gz) = b1189c4d8a82e16334a2d116370c3e50edea0c2efaf91f4856605b1e566e808e86fc076796a7855efe709c7fafc7a0e2f924ce31cb245d6a3e362793a4a8be64 +SHA512 (kicad-symbols-5.1.7.tar.gz) = 0b6a4451957fcbce9a08706d121bbb853782c1163f8daba35f229b08577001bc1de41148340e59d3865d5b2775537c6ced1bede913845dc531d025559725f393 +SHA512 (kicad-templates-5.1.7.tar.gz) = 1c836ac53ab87e83118d158076f8527c0ec47aa047a385f836536971d9f0adc56c6c0029a1ce14828c31d7d446ac4b0cac7403dddec122633dee42ae6c33e4f6