From 6559d3b43fc01350b4916252c6c2a787cf61b71b Mon Sep 17 00:00:00 2001
From: Steven A. Falco <stevenfalco@gmail.com>
Date: Mar 01 2019 20:04:28 +0000
Subject: Update to 5.1.0-rc2


This release brings in many new features:

1) KiCad now uses gtk3 rather than gtk2
2) The ngspice simulator is now supported
3) python3 is used instead of python2, which allows us to support
   scripting.

Note that in some cases, graphics artifacts may be seen at certain zoom
levels.  If you are bothered by this, switch to "Fallback graphics"
(rather than Accelerated graphics), and also select "High Quality
Antialiasing" for the Fallback graphics.  This will eliminate the
artifacts.

---

diff --git a/.gitignore b/.gitignore
index 519d843..8d464b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -751,3 +751,10 @@ kicad-libraries-2010.05.27.tar.bz2
 /kicad-packages3D-5.0.2.tar.gz
 /kicad-symbols-5.0.2.tar.gz
 /kicad-templates-5.0.2.tar.gz
+/kicad-5.1.0-rc2.tar.xz
+/kicad-doc-5.1.0-rc2.tar.gz
+/kicad-footprints-5.1.0-rc2.tar.gz
+/kicad-i18n-5.1.0-rc2.tar.gz
+/kicad-packages3D-5.1.0-rc2.tar.gz
+/kicad-symbols-5.1.0-rc2.tar.gz
+/kicad-templates-5.1.0-rc2.tar.gz
diff --git a/kicad-5.0.1-freerouting.patch b/kicad-5.0.1-freerouting.patch
deleted file mode 100644
index 10737e6..0000000
--- a/kicad-5.0.1-freerouting.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 15e039ca1ca1af1f2c52a21d3571e9629c9580ef Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Mon, 4 Jun 2018 10:13:00 -0400
-Subject: [PATCH] Try to run freerouting by its JPackage launcher script
-
-It's a sin to touch the Java tool by its JAR file in Fedora.
----
- pcbnew/dialogs/dialog_freeroute_exchange.cpp | 23 +++++++++++++++++---
- 1 file changed, 20 insertions(+), 3 deletions(-)
-
-diff --git a/pcbnew/dialogs/dialog_freeroute_exchange.cpp b/pcbnew/dialogs/dialog_freeroute_exchange.cpp
-index 3200de151..17e9e0543 100644
---- a/pcbnew/dialogs/dialog_freeroute_exchange.cpp
-+++ b/pcbnew/dialogs/dialog_freeroute_exchange.cpp
-@@ -82,7 +82,10 @@ void DIALOG_FREEROUTE::init()
-     SetFocus();
-     m_freeRouterFound = false;
- 
--    wxFileName fileName( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
-+    wxFileName fileName( FindKicadFile( wxT( "freerouting" ) ), wxPATH_UNIX );
-+
-+    if( !fileName.FileExists() )
-+        fileName.Assign ( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
- 
-     if( fileName.FileExists() )
-         m_freeRouterFound = true;
-@@ -131,8 +134,22 @@ void DIALOG_FREEROUTE::OnLaunchButtonClick( wxCommandEvent& event )
-             return;
-     }
- 
--    wxFileName jarfileName( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
--    wxString command;
-+    wxFileName jarfileName( FindKicadFile( wxT( "freerouting" ) ), wxPATH_UNIX );
-+    wxString command = wxT( "" );
-+
-+    if( jarfileName.FileExists() )
-+    {
-+        command << wxChar( '"' ) << jarfileName.GetFullPath() << wxChar( '"' );
-+        // add option to load the .dsn file
-+        command << wxT( " -de " );
-+        // add *.dsn full filename (quoted):
-+        command << wxChar( '"' ) << dsnFile << wxChar( '"' );
-+
-+        ProcessExecute( command );
-+        return;
-+    } else {
-+        jarfileName.Assign ( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
-+    }
- 
-     // Find the Java application on Windows.
-     // Colud be no more needed since we now have to run only java, not java web start
diff --git a/kicad-5.0.1-nostrip.patch b/kicad-5.0.1-nostrip.patch
deleted file mode 100644
index 81f0494..0000000
--- a/kicad-5.0.1-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 098dcd1e3..1f463a440 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -335,8 +335,6 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
-             set( CMAKE_SHARED_LINKER_FLAGS "${TO_LINKER},--no-undefined" )
-             set( CMAKE_MODULE_LINKER_FLAGS "${TO_LINKER},--no-undefined" )
- 
--            set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" )
--
-             # Defeat ELF's ability to use the GOT to replace locally implemented functions
-             # with ones from another module.
-             # https://bugs.launchpad.net/kicad/+bug/1322354
diff --git a/kicad-5.1.0-nostrip.patch b/kicad-5.1.0-nostrip.patch
new file mode 100644
index 0000000..46ce2b2
--- /dev/null
+++ b/kicad-5.1.0-nostrip.patch
@@ -0,0 +1,25 @@
+From 279c62e6547e6e2d9296ef0e8449e32e1a2cb9ba Mon Sep 17 00:00:00 2001
+From: "Steven A. Falco" <stevenfalco@gmail.com>
+Date: Fri, 1 Mar 2019 11:07:18 -0500
+Subject: [PATCH] Do not strip binaries
+
+---
+ CMakeLists.txt | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c170e76bd..5adde81b4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -353,8 +353,6 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
+             set( CMAKE_SHARED_LINKER_FLAGS "${TO_LINKER},--no-undefined" )
+             set( CMAKE_MODULE_LINKER_FLAGS "${TO_LINKER},--no-undefined" )
+ 
+-            set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" )
+-
+             # Defeat ELF's ability to use the GOT to replace locally implemented functions
+             # with ones from another module.
+             # https://bugs.launchpad.net/kicad/+bug/1322354
+-- 
+2.20.1
+
diff --git a/kicad.spec b/kicad.spec
index 054e3b7..76ac686 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -1,22 +1,32 @@
+%global candidate rc2
+
 Name:           kicad
-Version:        5.0.2
-Release:        5%{?dist}
+Version:        5.1.0
+Release:        0.1.%{candidate}%{?dist}
 Epoch:          1
 Summary:        EDA software suite for creation of schematic diagrams and PCBs
 
 License:        AGPLv3+
 URL:            http://www.kicad-pcb.org
 
-Source0:        https://launchpad.net/kicad/5.0/%{version}/+download/kicad-%{version}.tar.xz
-Source1:        https://github.com/KiCad/kicad-doc/archive/%{version}.tar.gz#/kicad-doc-%{version}.tar.gz
-Source2:        https://github.com/KiCad/kicad-i18n/archive/%{version}.tar.gz#/kicad-i18n-%{version}.tar.gz
-Source3:        https://github.com/KiCad/kicad-templates/archive/%{version}.tar.gz#/kicad-templates-%{version}.tar.gz
-Source4:        https://github.com/KiCad/kicad-symbols/archive/%{version}.tar.gz#/kicad-symbols-%{version}.tar.gz
-Source5:        https://github.com/KiCad/kicad-footprints/archive/%{version}.tar.gz#/kicad-footprints-%{version}.tar.gz
-Source6:        https://github.com/KiCad/kicad-packages3D/archive/%{version}.tar.gz#/kicad-packages3D-%{version}.tar.gz
-
-Patch1:         kicad-5.0.1-nostrip.patch
-Patch2:         kicad-5.0.1-freerouting.patch
+# These are temporary until 5.1.0 is released.
+Source0:        https://launchpad.net/kicad/5.0/%{version}-%{candidate}/+download/kicad-%{version}-%{candidate}.tar.xz
+Source1:        https://github.com/KiCad/kicad-doc/archive/%{version}-%{candidate}.tar.gz#/kicad-doc-%{version}-%{candidate}.tar.gz
+Source2:        https://github.com/KiCad/kicad-i18n/archive/%{version}-%{candidate}.tar.gz#/kicad-i18n-%{version}-%{candidate}.tar.gz
+Source3:        https://github.com/KiCad/kicad-templates/archive/%{version}-%{candidate}.tar.gz#/kicad-templates-%{version}-%{candidate}.tar.gz
+Source4:        https://github.com/KiCad/kicad-symbols/archive/%{version}-%{candidate}.tar.gz#/kicad-symbols-%{version}-%{candidate}.tar.gz
+Source5:        https://github.com/KiCad/kicad-footprints/archive/%{version}-%{candidate}.tar.gz#/kicad-footprints-%{version}-%{candidate}.tar.gz
+Source6:        https://github.com/KiCad/kicad-packages3D/archive/%{version}-%{candidate}.tar.gz#/kicad-packages3D-%{version}-%{candidate}.tar.gz
+
+#Source0:        https://launchpad.net/kicad/5.0/%%{version}/+download/kicad-%%{version}.tar.xz
+#Source1:        https://github.com/KiCad/kicad-doc/archive/%%{version}.tar.gz#/kicad-doc-%%{version}.tar.gz
+#Source2:        https://github.com/KiCad/kicad-i18n/archive/%%{version}.tar.gz#/kicad-i18n-%%{version}.tar.gz
+#Source3:        https://github.com/KiCad/kicad-templates/archive/%%{version}.tar.gz#/kicad-templates-%%{version}.tar.gz
+#Source4:        https://github.com/KiCad/kicad-symbols/archive/%%{version}.tar.gz#/kicad-symbols-%%{version}.tar.gz
+#Source5:        https://github.com/KiCad/kicad-footprints/archive/%%{version}.tar.gz#/kicad-footprints-%%{version}.tar.gz
+#Source6:        https://github.com/KiCad/kicad-packages3D/archive/%%{version}.tar.gz#/kicad-packages3D-%%{version}.tar.gz
+
+Patch1:         kicad-5.1.0-nostrip.patch
 
 # kicad is only available on the following architectures (see https://bugs.launchpad.net/kicad/+bug/1755752):
 ExclusiveArch:  %{ix86} x86_64 %{arm} aarch64
@@ -55,7 +65,7 @@ diagrams and printed circuit board artwork of up to
 Summary:        3D Models for KiCad
 License:        CC-BY-SA 4.0 with exception
 BuildArch:      noarch
-Requires:       kicad >= 5.0.0
+Requires:       kicad >= 5.1.0
 
 %description    packages3d
 3D Models for KiCad.
@@ -92,10 +102,44 @@ Documentation for KiCad.
 
 
 %prep
-%setup -q -a 1 -a 2 -a 3 -a 4 -a 5 -a 6
+# The -rc2 source tar on launchpad has a root directory that includes the -rc2
+# name component, so we have to account for that.
+%setup -n kicad-%{version}-%{candidate}
+
+# The doc repo will create a tar with -rc2 in the root dir name.  We rename
+# the dir to remove the -rc2 portion.
+%setup -n kicad-%{version}-%{candidate} -D -T -a 1
+mv kicad-doc-%{version}-%{candidate} kicad-doc-%{version}
+
+# The i18n repo will create a tar with -rc2 in the root dir name.  We rename
+# the dir to remove the -rc2 portion.
+%setup -n kicad-%{version}-%{candidate} -D -T -a 2
+mv kicad-i18n-%{version}-%{candidate} kicad-i18n-%{version}
+
+# The templates repo will create a tar with -rc2 in the root dir name.  We
+# rename the dir to remove the -rc2 portion.
+%setup -n kicad-%{version}-%{candidate} -D -T -a 3
+mv kicad-templates-%{version}-%{candidate} kicad-templates-%{version}
+
+# The symbols repo will create a tar with -rc2 in the root dir name.  We
+# rename the dir to remove the -rc2 portion.
+%setup -n kicad-%{version}-%{candidate} -D -T -a 4
+mv kicad-symbols-%{version}-%{candidate} kicad-symbols-%{version}
+
+# The footprints repo will create a tar with -rc2 in the root dir name.  We
+# rename the dir to remove the -rc2 portion.
+%setup -n kicad-%{version}-%{candidate} -D -T -a 5
+mv kicad-footprints-%{version}-%{candidate} kicad-footprints-%{version}
+
+# The packages3D repo will create a tar with -rc2 in the root dir name.  We
+# rename the dir to remove the -rc2 portion.
+%setup -n kicad-%{version}-%{candidate} -D -T -a 6
+mv kicad-packages3D-%{version}-%{candidate} kicad-packages3D-%{version}
+
+# Eventually we should just be able to do:
+#%%setup -q -a 1 -a 2 -a 3 -a 4 -a 5 -a 6
 
 %patch1 -p1
-%patch2 -p1
 
 
 %build
@@ -235,6 +279,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
 
 
 %changelog
+* Fri Mar 01 2019 Steven A. Falco <stevenfalco@gmail.com> - 1:5.1.0-0.1.rc2
+- Update to 5.1.0-rc2
+
 * Thu Jan 31 2019 Steven A. Falco <stevenfalco@gmail.com> - 1:5.0.2-5
 - Remove workaround for ngspice library
 
diff --git a/sources b/sources
index 87afded..cc37650 100644
--- a/sources
+++ b/sources
@@ -1,7 +1,7 @@
-SHA512 (kicad-5.0.2.tar.xz) = 54fc92238e23e3dd3287f6df797e53561e6a0e9c5cfa50066ffd92883f79af94f26db611f6fe658eeabf2199b76cd763633326c89b3f34194bd8fd9094f5fd21
-SHA512 (kicad-doc-5.0.2.tar.gz) = e9f34c478c0eb4d79c13236a5b105882a8411047c73ed822df2fad1b1eaabc45d8fd61a055069000ebfc724e6e3e828dbab16855cfe51bb70623a56e1e50f0d8
-SHA512 (kicad-footprints-5.0.2.tar.gz) = b7c58ef9b80973d358ab9149de811023828627d1870e25f4476b4994a5416d5aa9dc14b15d0f91820d0819fc529501e689b34311f88d1f115119581602291ad7
-SHA512 (kicad-i18n-5.0.2.tar.gz) = e46009080aa164eaa2d65d875f8abfa5a28343c60beb5abc752755e94540d9450ad78b18291834919c01e6ed2723e0888d068a20f162568c6afd524e47c92204
-SHA512 (kicad-packages3D-5.0.2.tar.gz) = 3a02fce096623b5e7e951708a6c5a29725474ddce2e5b0f11c08a8742d0de9136ecd0ac7dc49e239a256eccd38b0806a1c0f4b78c0d14e6889a701f876947fce
-SHA512 (kicad-symbols-5.0.2.tar.gz) = bcef99f582125e9452e7ba39b65da17952bf933be3cfd5b138bede502b8749c3f76a2a9b71ffa4305205b2969d62518b034c38da531c2d0148bbc2eb0c5a46d3
-SHA512 (kicad-templates-5.0.2.tar.gz) = a5a1722914477bb0cd1d3b0536906fd406846579a929dc30c5425deb09a39594375920e19d30f3255b0509f66d6094202bd07281dbcf91ad68205339116ea51f
+SHA512 (kicad-5.1.0-rc2.tar.xz) = 17d44d5d94b64db6810212738551f7fb1504448801d0b455f4fc460bd11948623850ad4daac25a11dbbb4415323988119b24f89f1d273ff935d71996af39853d
+SHA512 (kicad-doc-5.1.0-rc2.tar.gz) = a9c747edc174a6866a60e59bdc5b7c249bdea580ba4fc36977c3d1f3387df2a88c63acdbf7f505313cd35867f542340652599bd2a556790efbbb5f19aee6edc0
+SHA512 (kicad-footprints-5.1.0-rc2.tar.gz) = eb9e7eea1e02c9b28cdc6e7817f8ac1934fe6a810d2ac246e7e05e23b6aeb1abf7f35f76808ea75a24fd0da99168c21c9a772a9d114e8979686ec68b6cae329c
+SHA512 (kicad-i18n-5.1.0-rc2.tar.gz) = 7b836c3046cedcd8711e57ee2453ab381d8dce2d884a845f12b1a2dfe9d4f67b30fba93896f7af15902d8a2f1ec0eb30954a7232e25e8bae0a8e0862fad79ffc
+SHA512 (kicad-packages3D-5.1.0-rc2.tar.gz) = 16fe348bd6798bafb7acedd7c8f838222bdddd6aaaf06af5602f621d085412e7639cf17588f5c4672f2c7975d91a8f35b095e6381ac67f569d3a762be65d2060
+SHA512 (kicad-symbols-5.1.0-rc2.tar.gz) = 8465686f257e1255e0c791651350ee118e133bbab11e06c0caac3e0fd2aaa481a564800d5ad06b1b9b5ed78a954447254df2934ebda700b21c7db991ad9e571f
+SHA512 (kicad-templates-5.1.0-rc2.tar.gz) = a9dab1c4646f1d1b52904d1e60ca8e9343a0d08588946cbaea7bb4d436cb782b3060cde9a21c2e6ab1b1bc681e3871690d231b6dccd37780ed686cd35b537f64