[eclipse-m2e-core] Cleanup requires and build-requires

Mikolaj Izdebski mizdebsk at fedoraproject.org
Thu Mar 12 20:11:41 UTC 2015


commit 5819966e45c582f4c0067f3f91c9bc2406de4f5a
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Mar 12 21:11:14 2015 +0100

    Cleanup requires and build-requires

 eclipse-m2e-core.spec | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec
index e88b897..c8f3af5 100644
--- a/eclipse-m2e-core.spec
+++ b/eclipse-m2e-core.spec
@@ -1,4 +1,3 @@
-
 %global install_loc          %{_datadir}/eclipse/dropins/m2e-core
 %global release_dir          milestones/1.6/1.6.0.20150203-1921
 
@@ -32,9 +31,6 @@ Patch4:         %{name}-artifactinfo-return-type.patch
 # Have to specify type here
 Patch5:         %{name}-remotearchetypecatalogdialog.patch
 
-# org.eclipse.m2e.launching tries to bundle jars, but they don't seem needed
-#Patch6:         %{name}-org.eclipse.m2e.launching-build.properties.patch
-
 # In updated lucene in F18, some methods have been renamed
 Patch8:         %{name}-lucene-deprecated-methods.patch
 
@@ -47,7 +43,6 @@ Patch10:        %{name}-indexer-5.1.1.patch
 Patch15:        %{name}-NexusIndexManager.patch
 
 # API change in aether (remove once implemented)
-#Patch13:        %{name}-ContextRepositorySystemSession-missing-method.patch
 Patch14:        %{name}-LifecycleMappingFactory.patch
 
 # API changes in lucene 4
@@ -58,14 +53,12 @@ Patch17:        %{name}-jetty-8.patch
 
 BuildArch:      noarch
 
-BuildRequires: eclipse-m2e-workspace
-BuildRequires: takari-lifecycle
-
 # Maven build-requires for the main build.  After successfull build
 # they can be regenerated with the following command:
 #   xmvn-builddep <path-to-build-log>
 BuildRequires:  maven-local
 BuildRequires:  eclipse-license
+BuildRequires:  mvn(io.takari.m2e.workspace:org.eclipse.m2e.workspace.cli)
 BuildRequires:  mvn(org.codehaus.modello:modello-maven-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(org.eclipse.tycho:target-platform-configuration)
@@ -79,6 +72,7 @@ BuildRequires:  mvn(org.sonatype.forge:forge-parent:pom:)
 BuildRequires:  mvn(com.google.guava:guava)
 BuildRequires:  mvn(io.takari.aether:aether-connector-okhttp)
 BuildRequires:  mvn(io.takari.aether:takari-local-repository)
+BuildRequires:  mvn(io.takari:takari:pom:)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.archetype:archetype-common)
 BuildRequires:  mvn(org.apache.maven.indexer:indexer-core)
@@ -166,6 +160,7 @@ BuildRequires:  jetty8
 # m2e these requires can be regenerated with the following command:
 #   rpm -qf --qf 'Requires:       %{name}\n' $(readlink $(find /usr/share/eclipse/dropins/m2e-core -type l)) | sort -u
 Requires:       aether-api
+Requires:       aether-connector-basic
 Requires:       aether-connector-okhttp
 Requires:       aether-impl
 Requires:       aether-spi
@@ -181,17 +176,17 @@ Requires:       apache-commons-logging
 Requires:       atinject
 Requires:       bouncycastle
 Requires:       dom4j
+Requires:       eclipse-m2e-workspace
 Requires:       geronimo-jms
 Requires:       google-guice
 Requires:       guava
-Requires:       hamcrest
+Requires:       jakarta-oro
 Requires:       javamail
-Requires:       jboss-transaction-1.2-api
 Requires:       jchardet
 Requires:       jdom
+Requires:       jetty8
 Requires:       jetty-util
 Requires:       jsr-305
-Requires:       junit
 Requires:       log4j12
 Requires:       lucene
 Requires:       lucene-analysis
@@ -215,8 +210,9 @@ Requires:       maven-project
 Requires:       maven-wagon-file
 Requires:       maven-wagon-provider-api
 Requires:       multithreadedtc
+Requires:       objectweb-asm
 Requires:       okhttp
-Requires:       okhttp-protocols
+Requires:       okio
 Requires:       plexus-build-api
 Requires:       plexus-cipher
 Requires:       plexus-classworlds
@@ -229,6 +225,7 @@ Requires:       plexus-velocity
 Requires:       sisu-inject
 Requires:       sisu-plexus
 Requires:       slf4j
+Requires:       takari-filemanager
 Requires:       takari-local-repository
 Requires:       truezip-driver-file
 Requires:       truezip-driver-zip


More information about the scm-commits mailing list