From 847cd12b270b0ed534b49929bcdb43fe3ee7eab8 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Mar 20 2017 14:52:34 +0000
Subject: Update to lucene 6

Add "spatial-extras" subpackage, this decouples dependencies on spatial4j.

---

diff --git a/.gitignore b/.gitignore
index 695eef3..3065f7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@ dev-tools.tar.xz
 /dev-tools-5.4.1.tar.xz
 /lucene-5.4.1-src.tgz
 /solr-5.5.0-src.tgz
+/solr-6.1.0-src.tgz
diff --git a/0001-Disable-ivy-settings.patch b/0001-Disable-ivy-settings.patch
index 6f9dbbe..8a39c17 100644
--- a/0001-Disable-ivy-settings.patch
+++ b/0001-Disable-ivy-settings.patch
@@ -11,14 +11,13 @@ diff --git a/lucene/common-build.xml b/lucene/common-build.xml
 index 9e259e9..5416e1e 100644
 --- a/lucene/common-build.xml
 +++ b/lucene/common-build.xml
-@@ -439,7 +439,6 @@
+@@ -394,7 +394,6 @@
            you have an idea, fix it.
            unless="ivy.settings.uptodate" -->
      <!-- override: just for safety, should be unnecessary -->
--    <ivy:configure file="${common.dir}/ivy-settings.xml" override="true"/>
+-    <ivy:configure file="${common.dir}/top-level-ivy-settings.xml" override="true"/>
      <!-- <property name="ivy.settings.uptodate" value="true"/> -->
    </target>
  
 -- 
 2.5.0
-
diff --git a/lucene.spec b/lucene.spec
index 5b362ab..2b8ad0a 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -2,8 +2,8 @@
 
 Summary:        High-performance, full-featured text search engine
 Name:           lucene
-Version:        5.5.0
-Release:        7%{?dist}
+Version:        6.1.0
+Release:        1%{?dist}
 Epoch:          0
 License:        ASL 2.0
 URL:            http://lucene.apache.org/
@@ -190,9 +190,15 @@ Summary:      Lucene Facets Module
 Package for Faceted Indexing and Search.
 
 %package spatial
-Summary:      Spatial Strategies for Apache Lucene
+Summary:      Geospatial indexing APIs for Apache Lucene
 
 %description spatial
+Geospatial indexing APIs for Apache Lucene.
+
+%package spatial-extras
+Summary:      Spatial Strategies for Apache Lucene
+
+%description spatial-extras
 Spatial Strategies for Apache Lucene.
 
 %package spatial3d
@@ -275,9 +281,6 @@ sed -i 's/-filter-pom-templates/filter-pom-templates/' lucene/common-build.xml
 # will recompile with maven anyway
 %pom_xpath_remove 'target[@name="compile-tools"]/modules-crawl' lucene/build.xml
 
-# unresolvable test dep
-%pom_remove_dep com.spatial4j:spatial4j::test lucene/spatial
-
 # suggest provides spellchecker
 %mvn_alias :%{name}-suggest :%{name}-spellchecker
 
@@ -306,6 +309,15 @@ done
 %pom_disable_module src/test core
 %pom_disable_module src/test codecs
 
+# unresolvable test dep
+%pom_remove_dep org.locationtech.spatial4j:spatial4j::test spatial-extras
+
+# fix dep on spatial4j
+%pom_change_dep org.locationtech.spatial4j:spatial4j com.spatial4j:spatial4j spatial-extras
+%pom_change_dep org.locationtech.spatial4j:spatial4j com.spatial4j:spatial4j benchmark
+find benchmark spatial-extras -name *.java -exec sed -i \
+  -e 's/org\.locationtech\.spatial4j/com.spatial4j.core/' {} \;
+
 # test deps
 %pom_add_dep org.antlr:antlr-runtime::test demo
 
@@ -336,6 +348,7 @@ pushd lucene
 %pom_disable_module misc
 %pom_disable_module replicator
 %pom_disable_module spatial
+%pom_disable_module spatial-extras
 %pom_disable_module spatial3d
 %pom_disable_module suggest
 
@@ -360,7 +373,7 @@ popd
 %if %{without jp_minimal}
 pushd lucene/misc/target
 unzip lucene-misc-%{version}.jar META-INF/MANIFEST.MF
-sed -i -e '1aRequire-Bundle: org.apache.lucene.core
+sed -i -e '1aRequire-Bundle: org.apache.lucene.core;bundle-version="[%{version},7)"
 ' META-INF/MANIFEST.MF
 jar ufm lucene-misc-%{version}.jar META-INF/MANIFEST.MF 2>&1 > /dev/null
 popd
@@ -371,7 +384,7 @@ popd
 %if 0%{?fedora} == 24
 pushd lucene/analysis/common/target
 unzip lucene-analyzers-common-%{version}.jar META-INF/MANIFEST.MF
-sed -i -e 's/org.apache.lucene.analysis,/org.apache.lucene.analysis;version="[5.5,6)",/' META-INF/MANIFEST.MF
+sed -i -e 's/org.apache.lucene.analysis,/org.apache.lucene.analysis;version="[%{version},7)",/' META-INF/MANIFEST.MF
 jar ufm lucene-analyzers-common-%{version}.jar META-INF/MANIFEST.MF 2>&1 > /dev/null
 popd
 %endif
@@ -409,6 +422,7 @@ popd
 %files suggest -f .mfiles-%{name}-suggest
 %files facet -f .mfiles-%{name}-facet
 %files spatial -f .mfiles-%{name}-spatial
+%files spatial-extras -f .mfiles-%{name}-spatial-extras
 %files spatial3d -f .mfiles-%{name}-spatial3d
 %files codecs -f .mfiles-%{name}-codecs
 %files analyzers-phonetic -f .mfiles-%{name}-analyzers-phonetic
@@ -423,6 +437,10 @@ popd
 %license LICENSE.txt NOTICE.txt
 
 %changelog
+* Mon Mar 20 2017 Mat Booth <mat.booth@redhat.com> - 0:6.1.0-1
+- Update to lucene 6
+- Add "spatial-extras" subpackage, this decouples dependencies on spatial4j.
+
 * Thu Mar 16 2017 Michael Simacek <msimacek@redhat.com> - 0:5.5.0-7
 - Add jp_minimal conditional
 
diff --git a/sources b/sources
index d6ff324..c21527f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-452ae1b1d93cd5e93193c3597b2fa198  solr-5.5.0-src.tgz
+SHA512 (solr-6.1.0-src.tgz) = 63989f6a0004026ec071ac5b0a569f7f1f401c76719e32467768df135e94da0bde819673fbe35ee5929cd650fcb288b31db2b3b76152e7f3e82cb1a471e96199