The package rpms/eclipse-m2e-core.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/eclipse-m2e-core.git/commit/?id=2796....
Change: +ExcludeArch: s390 %{arm} %{ix86}
Thanks.
Full change: ============
commit 27964daef653306e9af1c394433b911a42221705 Author: Mat Booth mat.booth@redhat.com Date: Fri Mar 15 10:25:46 2019 +0000
Update to 2019-03 release Restrict to same architectures as Eclipse itself Fix bundle name of annotations-api
diff --git a/eclipse-m2e-core-LifecycleMappingFactory.patch b/eclipse-m2e-core-LifecycleMappingFactory.patch index 8c66b2e..1e399eb 100644 --- a/eclipse-m2e-core-LifecycleMappingFactory.patch +++ b/eclipse-m2e-core-LifecycleMappingFactory.patch @@ -1,6 +1,6 @@ --- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java +++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java -@@ -634,12 +634,12 @@ public class LifecycleMappingFactory { +@@ -687,12 +687,12 @@ public class LifecycleMappingFactory { List<PluginExecutionMetadata> result = new ArrayList<PluginExecutionMetadata>(); all_metadatas: for(PluginExecutionMetadata metadata : metadatas) { @SuppressWarnings("unchecked") diff --git a/eclipse-m2e-core-fix-manifests.patch b/eclipse-m2e-core-fix-manifests.patch index 4a52c3d..f9bd72a 100644 --- a/eclipse-m2e-core-fix-manifests.patch +++ b/eclipse-m2e-core-fix-manifests.patch @@ -1,6 +1,6 @@ --- org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF +++ org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF -@@ -37,7 +37,9 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.6.0,1.7.0)", +@@ -36,7 +36,9 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.6.0,1.7.0)", org.eclipse.core.expressions;bundle-version="3.4.101", org.eclipse.ui.forms;bundle-version="3.4.1", org.eclipse.jface.text, diff --git a/eclipse-m2e-core-indexer-5.1.1.patch b/eclipse-m2e-core-indexer-5.1.1.patch index 9e83e75..ecf3647 100644 --- a/eclipse-m2e-core-indexer-5.1.1.patch +++ b/eclipse-m2e-core-indexer-5.1.1.patch @@ -2,7 +2,7 @@ diff --git m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml m2e-maven-run index af8200b..d97e974 100644 --- m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml +++ m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml -@@ -25,7 +25,7 @@ +@@ -23,7 +23,7 @@ <dependency> <groupId>org.apache.maven.indexer</groupId> <artifactId>indexer-core</artifactId> diff --git a/eclipse-m2e-core-mandatory-OSGi-attributes.patch b/eclipse-m2e-core-mandatory-OSGi-attributes.patch index 7dbe3f7..a60aaf4 100644 --- a/eclipse-m2e-core-mandatory-OSGi-attributes.patch +++ b/eclipse-m2e-core-mandatory-OSGi-attributes.patch @@ -1,6 +1,6 @@ --- m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml +++ m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml -@@ -88,8 +88,8 @@ +@@ -66,8 +66,8 @@
<_exportcontents> META-INF.plexus;-noimport:=true;x-internal:=true, @@ -13,7 +13,7 @@ <Import-Package> --- m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml +++ m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml -@@ -63,8 +63,7 @@ +@@ -62,8 +62,7 @@
<_exportcontents> META-INF.plexus;-noimport:=true, @@ -25,7 +25,7 @@ <Import-Package> --- m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml +++ m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml -@@ -145,12 +145,12 @@ +@@ -164,12 +164,12 @@ <_exportcontents> META-INF.plexus;-noimport:=true, META-INF.sisu;-noimport:=true, diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec index 978e336..61a9303 100644 --- a/eclipse-m2e-core.spec +++ b/eclipse-m2e-core.spec @@ -1,16 +1,16 @@ -%global release_dir m2e-core-f13f3346eb19e1a98c0271d4b08faa6ac5c5c9b3 +%global release_dir m2e-core-c5392da6bab9893bcbf5b43f651abe48d5819bea
Name: eclipse-m2e-core -Version: 1.10.0 -Release: 2%{?dist} +Version: 1.11.0 +Release: 1%{?dist} Summary: Maven integration for Eclipse
# Most of components are under EPL, but some of them are licensed under # ASL 2.0 license. License: EPL-1.0 and ASL 2.0 -URL: http://eclipse.org/m2e/ +URL: https://eclipse.org/m2e/
-Source0: http://git.eclipse.org/c/m2e/m2e-core.git/snapshot/%%7Brelease_dir%7D.tar.xz +Source0: https://git.eclipse.org/c/m2e/m2e-core.git/snapshot/%%7Brelease_dir%7D.tar.x... Source1: http://www.eclipse.org/legal/epl-v10.html
# Add some necessary stuff (mainly requires & imports) to manifests @@ -32,18 +32,17 @@ Patch4: %{name}-mandatory-OSGi-attributes.patch # Port to lucene 5 Patch5: %{name}-lucene-5.patch
-%if 0%{?fedora} < 29 -# Fix build against latest maven < 3.5.3 +# Fix build against older maven < 3.5.3 as available on rhel 7 Patch6: eclipse-m2e-maven353.patch -%endif
-%if 0%{?fedora} >= 30 # Fix build against latest maven-resolver -Patch6: eclipse-m2e-maven-resolver-1.3.patch -%endif +Patch7: eclipse-m2e-maven-resolver-1.3.patch
BuildArch: noarch
+# Upstream Eclipse no longer supports non-64bit arches +ExcludeArch: s390 %{arm} %{ix86} + # Maven build-requires for the main build. After successfull build # they can be regenerated with the following command: # xmvn-builddep <path-to-build-log> @@ -250,7 +249,7 @@ This package contains %{summary}.
%prep -%autosetup -N -n %{release_dir} +%setup -q -n %{release_dir}
find -name '*.class' -delete find -name '*.jar' -delete @@ -294,7 +293,25 @@ for d in `find m2e-maven-runtime/* -maxdepth 0 -type d`; do %pom_xpath_set pom:Embed-Dependency "*;scope=compile|runtime;groupId=!org.apache.lucene|org.ow2.asm" $d done
-%autopatch -p0 +%patch0 -p0 +%patch1 -p0 +%patch2 -p0 +%patch3 -p0 +%patch4 -p0 +%patch5 -p0 +%if 0%{?rhel} == 7 +%patch6 -p0 +%endif +%patch7 -p0 + +# Not needed for RPM builds +%pom_remove_plugin ":jacoco-maven-plugin" + +# Fix BSN of annotations +sed -i -e 's/>javax.annotation</>javax.annotation-api</' \ + org.eclipse.m2e.importer.tests/pom.xml org.eclipse.m2e.binaryproject.tests/pom.xml +sed -i -e 's/javax.annotation;/javax.annotation-api;/' \ + org.eclipse.m2e.core.tests/META-INF/MANIFEST.MF
# Specify a guava version sed -i -e '/com.google.guava/a<version>20.0</version>' \ @@ -350,6 +367,11 @@ xmvn-subst -s $(find %{buildroot}%{_datadir}/eclipse/droplets/m2e-core -name jar %license epl-v10.html LICENSE-2.0.txt
%changelog +* Fri Mar 15 2019 Mat Booth mat.booth@redhat.com - 1.11.0-1 +- Update to 2019-03 release +- Restrict to same architectures as Eclipse itself +- Fix bundle name of annotations-api + * Thu Jan 31 2019 Fedora Release Engineering releng@fedoraproject.org - 1.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources index 7e66dfd..34c44da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (m2e-core-f13f3346eb19e1a98c0271d4b08faa6ac5c5c9b3.tar.xz) = e2bc0f1f68cad1d8aff1ac40297b6b251ffd97ab3fd18ccaada4a16ae4a7dd2e3a4038a060b2198c87bca047dda581be3a5554c25ea866e9ed38844de57cca37 +SHA512 (m2e-core-c5392da6bab9893bcbf5b43f651abe48d5819bea.tar.xz) = f518d1fe323b3c64e26ca15c71ad31c2a074e1c0e4ee2bc886a915a50a7eb9c9dc1b4064d94b28db05850b1da2b80715bb7a05da0adf3f21d8984f24b581b97b