rpms/eclipse
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation against lucene 3.x.

Browse Source
This commit is contained in:
Alexander Kurtakov 2012-07-05 14:08:47 +03:00
parent 0fcb34fe3c
commit c54af422f1
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
eclipse.spec
View File

@ -20,7 +20,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_version}
Release: 1%{?dist}
Release: 2%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@ -33,6 +33,7 @@ Source5: http://repo1.maven.org/maven2/org/eclipse/osgi/org.eclipse.osgi/
Source6: org.eclipse.osgi.services-3.2.100.v20100503.pom
Source7: http://repo1.maven.org/maven2/org/eclipse/equinox/http/servlet/1.0.0-v20070606/servlet-1.0.0-v20070606.pom
Source8: org.eclipse.jdt.core-3.8.0.v_C03.pom
Patch0: lucene-3.6-compile.patch
BuildRequires: ant >= 1.8.3
BuildRequires: rsync
@ -208,8 +209,11 @@ export JAVA_HOME=%{java_home}
%setup -q -n eclipse-build-%{eb_sha1}
cp %{SOURCE1} .
ant applyPatches
%patch0
pushd build/eclipse-%{eclipse_version}-%{build_id}-src
sed -i -e "s|\[2.9.0,3.0.0)|\[2.9.0,4.0.0)|g" plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
# Use our system-installed javadocs, reference only what we built, and
# don't like to osgi.org docs (FIXME: maybe we should package them?)
sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \
@ -687,6 +691,9 @@ rm -rf %{_bindir}/efj/
%{_mavendepmapfragdir}/*
%changelog
* Thu Jul 5 2012 Alexander Kurtakov <akurtako@redhat.com> 1:4.2.0-2
- Fix compilation against lucene 3.x.
* Fri Jun 29 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-1
- Included patch for Eclipse bug 251167
- Recompiled all jsr14 bundles as 1.5

11
lucene-3.6-compile.patch Normal file
View File

@ -0,0 +1,11 @@
--- build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java.sav 2012-06-27 16:52:22.000000000 +0300
+++ build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java 2012-07-05 12:45:58.051494535 +0300
@@ -95,4 +95,8 @@ public final class WordTokenStream exten
return tokens.get(token++);
}
+
+ public boolean incrementToken() {
+ return false;
+ }
}