[eclipse-m2e-core/1.5.0-experimental: 4/9] Organise patch sections in spec file

Gerard Ryan galileo at fedoraproject.org
Fri Feb 28 23:52:09 UTC 2014


commit 635aea58e45fbb24bbd1dd34c25a98a886d5aac5
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Wed Feb 19 20:44:06 2014 +0000

    Organise patch sections in spec file

 eclipse-m2e-core.spec |   19 ++++++-------------
 1 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec
index b3d03a1..6fd0f48 100644
--- a/eclipse-m2e-core.spec
+++ b/eclipse-m2e-core.spec
@@ -37,9 +37,6 @@ 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
 
-# Exclude org.jboss.netty from the feature - causes tycho to fail
-Patch7:         %{name}-m2e.feature.patch
-
 # In updated lucene in F18, some methods have been renamed
 Patch8:         %{name}-lucene-deprecated-methods.patch
 
@@ -49,13 +46,11 @@ Patch9:         %{name}-m2e.core-modello-version.patch
 
 # API change in maven-indexer 5.1.1
 Patch10:        %{name}-indexer-5.1.1.patch
+Patch15:        %{name}-NexusIndexManager.patch
 
 # API change in aether (remove once implemented)
-Patch11:        %{name}-new-eclipse-aether-api.patch
-
-# Patch org.eclipse.m2e.launching for maven 3.1.0
-# Remove this for 1.5.0 since it's an upstream patch
-Patch12:        %{name}-test-maven310-launcher.patch
+Patch13:        %{name}-ContextRepositorySystemSession-missing-method.patch
+Patch14:        %{name}-LifecycleMappingFactory.patch
 
 BuildArch:      noarch
 
@@ -302,14 +297,12 @@ sed -i '/setupDefaultFilters/ a setupMatchPatterns();' org.eclipse.m2e.core/src/
 %patch4
 %patch5
 %patch6
-%patch7
 %patch8
 %patch9
 %patch10
-%patch11
-%patch12
-
-rm org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/FilterRepositorySystemSession.java
+%patch13
+%patch14
+%patch15
 
 
 %build


More information about the scm-commits mailing list