From dcb57395cb7b321973ee96437df8a1d227b4b712 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Oct 28 2020 18:31:22 +0000
Subject: Update to latest upsteam release


---

diff --git a/.gitignore b/.gitignore
index dd24dba..9fc0282 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@ dev-tools.tar.xz
 /solr-7.7.0-src.tgz
 /solr-8.1.1-src.tgz
 /solr-8.4.1-src.tgz
+/solr-8.6.3-src.tgz
diff --git a/0002-Dependency-generation.patch b/0002-Dependency-generation.patch
index e90a4dc..d022292 100644
--- a/0002-Dependency-generation.patch
+++ b/0002-Dependency-generation.patch
@@ -25,7 +25,7 @@ diff --git a/lucene/build.xml b/lucene/build.xml
 index e3cf905..facc19b 100644
 --- a/lucene/build.xml
 +++ b/lucene/build.xml
-@@ -427,12 +427,8 @@
+@@ -426,12 +426,8 @@
      </sequential>
    </target>
  
@@ -43,7 +43,7 @@ diff --git a/lucene/common-build.xml b/lucene/common-build.xml
 index 41da3f2..d2f9d16 100644
 --- a/lucene/common-build.xml
 +++ b/lucene/common-build.xml
-@@ -1876,7 +1876,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
+@@ -1884,7 +1884,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
    <target name="-get-maven-dependencies" depends="compile-tools,load-custom-tasks">
      <ant dir="${common.dir}/.." target="-append-all-modules-dependencies-properties" inheritall="false"/>
      <get-maven-dependencies-macro
diff --git a/lucene.spec b/lucene.spec
index 32379ae..47b659f 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -2,8 +2,8 @@
 
 Summary:        High-performance, full-featured text search engine
 Name:           lucene
-Version:        8.4.1
-Release:        9%{?dist}
+Version:        8.6.3
+Release:        1%{?dist}
 Epoch:          0
 License:        ASL 2.0
 URL:            http://lucene.apache.org/
@@ -45,11 +45,14 @@ Obsoletes: %{name}-benchmark < 8.1.1-3
 Obsoletes: %{name}-demo < 8.1.1-3
 Obsoletes: %{name}-facet < 8.1.1-3
 Obsoletes: %{name}-replicator < 8.1.1-3
-Obsoletes: %{name}-spatial < 8.1.1-3
 Obsoletes: %{name}-spatial-extras < 8.1.1-3
 Obsoletes: %{name}-spatial3d < 8.1.1-3
 Obsoletes: %{name}-test-framework < 8.4.1-4
 
+# Obsolete since F32
+# Module was removed upstream
+Obsoletes: %{name}-spatial < 8.1.1-3
+
 %if %{with jp_minimal}
 # Remove left-over packages that would have broken deps when built in minimal mode
 Obsoletes: %{name}-parent < %{version}-%{release}
@@ -303,7 +306,6 @@ pushd lucene
 %pom_disable_module test-framework
 %pom_disable_module facet
 %pom_disable_module replicator
-%pom_disable_module spatial
 %pom_disable_module spatial-extras
 %pom_disable_module spatial3d
 
@@ -381,6 +383,9 @@ popd
 %license lucene/LICENSE.txt lucene/NOTICE.txt
 
 %changelog
+* Wed Oct 28 17:46:57 GMT 2020 Mat Booth <mat.booth@redhat.com> - 0:8.6.3-1
+- Update to latest upsteam release
+
 * Thu Aug 06 2020 Mat Booth <mat.booth@redhat.com> - 0:8.4.1-9
 - Add optional resolution on internal JDK APIs that might not be present on Java
   11
diff --git a/sources b/sources
index bc1694c..3a4b2ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (solr-8.4.1-src.tgz) = 29df94ce5ee571b3cdb9738b1d05ed3e1abe4bc171b4407789100f338671a539d5751f27c12c3317f064354d5cb96df7cd0cf7d03de6882d06b5db4501e278ce
+SHA512 (solr-8.6.3-src.tgz) = 690ad5c5dcdabf058b2112a2d16c983b3dafc0b2aea03e96ccb13ec3f5b72ea6b70a57c307a402ece9efd5b2046244b0991a04b4c3da13ab3e3884ee73da5f24