Require newer ECJ with correct aliases

This commit is contained in:
Mat Booth 2016-04-22 16:32:01 +01:00
parent ee2f4805ef
commit 1463e5335e
1 changed files with 6 additions and 7 deletions

View File

@ -27,7 +27,7 @@
Name: %{?scl_prefix}tycho
Version: 0.25.0
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
# license file is missing but all files having some licensing information are ASL 2.0
@ -81,7 +81,7 @@ BuildRequires: apache-commons-exec
BuildRequires: bcel
BuildRequires: decentxml
BuildRequires: easymock
BuildRequires: ecj
BuildRequires: ecj >= 1:4.5.2-2
BuildRequires: maven-plugin-testing-harness
BuildRequires: xmvn-parent-pom
%if %{tycho_bootstrap}
@ -117,7 +117,7 @@ Requires: maven-local >= 4.2.0
Requires: maven-dependency-plugin
Requires: maven-verifier
Requires: objectweb-asm
Requires: ecj
Requires: ecj >= 1:4.5.2-2
%if ! %{eclipse_bootstrap}
Requires: eclipse-platform >= 1:4.6.0
%endif
@ -199,10 +199,6 @@ popd
# These units cannot be found during a regular build
sed -i '/^<unit id=.*$/d' tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
# We do not ship org.eclipse.jdt.compiler.apt
%pom_remove_dep "org.eclipse.tycho:org.eclipse.jdt.compiler.apt"
%pom_remove_dep "org.eclipse.tycho:org.eclipse.jdt.compiler.apt" tycho-compiler-jdt
# we don't have org.apache.commons:commons-compress:jar:sources
%pom_xpath_remove "pom:dependency[pom:classifier='sources' and pom:artifactId='commons-compress']" tycho-p2/tycho-p2-director-plugin
@ -428,6 +424,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li
%{_javadocdir}/tycho
%changelog
* Fri Apr 22 2016 Mat Booth <mat.booth@redhat.com> - 0.25.0-3
- Require newer ECJ with correct aliases
* Thu Apr 21 2016 Mat Booth <mat.booth@redhat.com> - 0.25.0-2
- Non-bootstrap build against Eclipse Neon