From 2dd44fbbb9c9ad65e746bf5e4959645581b01725 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Jul 02 2019 19:57:20 +0000 Subject: Re-generate OSGi BRs --- diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec index 54d011f..b33506a 100644 --- a/eclipse-m2e-core.spec +++ b/eclipse-m2e-core.spec @@ -2,7 +2,7 @@ Name: eclipse-m2e-core Version: 1.11.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Maven integration for Eclipse # Most of components are under EPL, but some of them are licensed under @@ -79,13 +79,14 @@ BuildRequires: mvn(org.slf4j:slf4j-simple) BuildRequires: mvn(org.sonatype.forge:forge-parent:pom:) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) - # OSGi build-requires. They can be regenerated with the following command: # sed -n 's/^Require-Bundle: //;T;:l;s/[;=,].*//;/^org.eclipse.m2e/bn;s/..*/BuildRequires: osgi(&)/;T;p;:n;n;s/^ //;T;bl' `find -name *.MF` | sort -u +BuildRequires: osgi(com.google.gson) BuildRequires: osgi(com.google.guava) BuildRequires: osgi(com.ibm.icu) +BuildRequires: osgi(javax.annotation-api) BuildRequires: osgi(org.apache.ant) -BuildRequires: osgi(org.apache.lucene.queryparser) +BuildRequires: osgi(org.apache.commons.io) BuildRequires: osgi(org.apache.maven.archetype.catalog) BuildRequires: osgi(org.apache.maven.archetype.descriptor) BuildRequires: osgi(org.eclipse.compare) @@ -126,7 +127,7 @@ BuildRequires: osgi(org.eclipse.jetty.server) BuildRequires: osgi(org.eclipse.jetty.util) BuildRequires: osgi(org.eclipse.jface) BuildRequires: osgi(org.eclipse.jface.text) -BuildRequires: osgi(org.eclipse.license) +BuildRequires: osgi(org.eclipse.license) < 2.0.0 BuildRequires: osgi(org.eclipse.ltk.core.refactoring) BuildRequires: osgi(org.eclipse.ltk.ui.refactoring) BuildRequires: osgi(org.eclipse.osgi) @@ -138,6 +139,7 @@ BuildRequires: osgi(org.eclipse.ui.editors) BuildRequires: osgi(org.eclipse.ui.externaltools) BuildRequires: osgi(org.eclipse.ui.forms) BuildRequires: osgi(org.eclipse.ui.ide) +BuildRequires: osgi(org.eclipse.ui.views) BuildRequires: osgi(org.eclipse.ui.workbench) BuildRequires: osgi(org.eclipse.ui.workbench.texteditor) BuildRequires: osgi(org.eclipse.wst.common.emf) @@ -358,6 +360,9 @@ xmvn-subst -s $(find %{buildroot}%{_datadir}/eclipse/droplets/m2e-core -name jar %license epl-v10.html LICENSE-2.0.txt %changelog +* Tue Jul 02 2019 Mat Booth - 1.11.0-7 +- Re-generate OSGi BRs + * Mon Jul 01 2019 Mat Booth - 1.11.0-6 - Drop hard requirement on xbean, not really needed by maven