diff --git a/eclipse-help-feature-adjust-dependencies.patch b/eclipse-help-feature-adjust-dependencies.patch index 8783168..59a82f7 100644 --- a/eclipse-help-feature-adjust-dependencies.patch +++ b/eclipse-help-feature-adjust-dependencies.patch @@ -87,8 +87,8 @@ diff -r -Nu eclipse-3.8.0-M1-src/plugins/org.eclipse.help.base/META-INF/MANIFEST org.eclipse.help.standalone -Require-Bundle: org.apache.lucene;bundle-version="2.9.0";visibility:=reexport, - org.apache.lucene.analysis;bundle-version="2.9.0";visibility:=reexport, -+Require-Bundle: org.apache.lucene.core;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, -+ org.apache.lucene.analysis;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, ++Require-Bundle: org.apache.lucene.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, ++ org.apache.lucene.analysis;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.ant.core;bundle-version="3.2.200";resolution:=optional, org.eclipse.core.runtime;bundle-version="3.6.0", org.eclipse.help;bundle-version="[3.5.0,4.0.0)";visibility:=reexport, diff --git a/eclipse.spec b/eclipse.spec index 65fb99e..41d3692 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -143,7 +143,8 @@ BuildRequires: batik >= 1.8 BuildRequires: xml-commons-apis >= 1.4.01-6 BuildRequires: atinject >= 1-6 BuildRequires: tycho >= 0.16 -BuildRequires: eclipse-emf-core +BuildRequires: tycho-extras >= 0.16 +BuildRequires: eclipse-emf-core >= 1:2.8.0-13 BuildRequires: eclipse-ecf-core %if 0%{?rhel} >= 6 @@ -362,7 +363,7 @@ cp %{SOURCE21} rt.equinox.incubator/framework/bundles/org.eclipse.equinox.initia sed -i -e "s/rt.equinox.p2<\/module>/rt.equinox.p2<\/module>rt.equinox.incubator<\/module>/" pom.xml - +sed -i -e "s/2.9,3.0/3.0,4.0/" eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml #sed -i -e "s/x86/x86_64/" eclipse.jdt.debug/org.eclipse.jdt.launching.macosx/pom.xml