diff --git a/eclipse.spec b/eclipse.spec index c743fb7..dc41d6c 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -8,7 +8,7 @@ Epoch: 1 -%global eb_commit c985e357223668b4bc1fb76ea6b9e0c12829b7e8 +%global eb_commit b056b40d26d052b788b790f27ead774ff804ab55 %global eclipse_rel %{version} %global eclipse_tag R-%{eclipse_rel}-202006040540 @@ -49,7 +49,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: 4.16 -Release: 3%{?dist} +Release: 4%{?dist} License: EPL-2.0 URL: http://www.eclipse.org/ @@ -456,6 +456,9 @@ sed -i -e 's/javax.annotation/%{_jakarta_annotations}/' eclipse-platform-parent/ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml \ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml +# Fix requirement on junit 4 +sed -i -e 's/4.13.0,5.0.0/4.12.0,5.0.0/' eclipse.jdt.ui/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java + # Disable examples %pom_disable_module infocenter-web eclipse.platform.ua %pom_disable_module examples rt.equinox.p2 @@ -1072,6 +1075,10 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Mon Jun 29 2020 Mat Booth - 1:4.16-4 +- Update linux-build snapshot and fix adding junit classpath containers to java + projects + * Tue Jun 23 2020 Mat Booth - 1:4.16-3 - Make a bit more portable and fix bootstrap mode diff --git a/sources b/sources index ef130bc..3ebba10 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8.tar.xz) = 79780efe9eed0082ea6de6978c5b65ccf5c65a242bff24f34cd763c0ca19a695e7735442aba20f5d2fca4153f7b59c5804fdcb67fa050480dcad137d664d3ce3 +SHA512 (org.eclipse.linuxtools.eclipse-build-b056b40d26d052b788b790f27ead774ff804ab55.tar.xz) = 8e781fe321597b257ecc9bfcefb7fb0955115c0d3188d4bff101218e562ef4a31e0abe1ef6afdd484e1afba50469a18cddd44ad835af3c0eda105214e4de9fb7 SHA512 (eclipse-platform-sources-4.16.tar.xz) = e97d56f4ff7accca82993ebb8edf6cd012f20273f063c764134753dafb38972497521f2a3150c2650655c17149e135eccf781b536d50b382cd1e2fb41ec4a692