Fix Lucene patch on F22

This commit is contained in:
Mat Booth 2016-02-29 23:21:58 +00:00
parent ecd5e2dd0a
commit 395cae2656
2 changed files with 11 additions and 7 deletions

View File

@ -483,7 +483,7 @@ diff --git a/dependencies/replace_platform_plugins_with_symlinks.sh b/dependenci
index b818924..f1a67b3 100755
--- a/dependencies/replace_platform_plugins_with_symlinks.sh
+++ b/dependencies/replace_platform_plugins_with_symlinks.sh
@@ -45,12 +45,7 @@ pushd $1
@@ -45,13 +45,7 @@ pushd $1
_symlink org.apache.felix.gogo.shell_ felix-gogo-shell/org.apache.felix.gogo.shell.jar
_symlink javax.annotation-api_ glassfish-annotation-api.jar
_symlink org.apache.lucene.core_ lucene/lucene-core.jar
@ -491,12 +491,13 @@ index b818924..f1a67b3 100755
- _symlink org.apache.lucene.analyzers-smartcn_ lucene/lucene-analyzers-smartcn.jar
- _symlink org.apache.lucene.queries lucene/lucene-queries.jar
- _symlink org.apache.lucene.queryparser lucene/lucene-queryparser.jar
- _symlink org.apache.lucene.sandbox lucene/lucene-sandbox.jar
- _symlink org.apache.regexp_ regexp.jar
- _symlink org.apache.lucene.sandbox_ lucene/lucene-sandbox.jar
- _symlink org.apache.lucene.spatial3d_ lucene/lucene-spatial3d.jar
- _symlink org.apache.lucene.spatial_ lucene/lucene-spatial.jar
+ _symlink org.apache.lucene.analysis_ lucene/lucene-analyzers-common.jar
_symlink org.eclipse.jetty.util_ jetty/jetty-util.jar
_symlink org.eclipse.jetty.server_ jetty/jetty-server.jar
_symlink org.eclipse.jetty.http_ jetty/jetty-http.jar
_symlink com.spatial4j_ spatial4j.jar
_symlink org.apache.xalan xalan-j2.jar
_symlink org.apache.xerces xerces-j2.jar
--- a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
+++ b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
@@ -95,7 +95,7 @@

View File

@ -49,7 +49,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_version}
Release: 1%{?dist}
Release: 2%{?dist}
License: EPL
URL: http://www.eclipse.org/
@ -1123,6 +1123,9 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
%changelog
* Mon Feb 29 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-2
- Fix Lucene patch on F22
* Mon Feb 29 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-1
- Update to Mars.2 release
- Update eclipse-build snapshot