From 0535591e2761c84c98b799340bcce47ae8ed7718 Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Jan 23 2013 19:26:11 +0000 Subject: Require archetype.descriptor in OSGi --- diff --git a/eclipse-m2e-core-fix-m2e.core-manifest-1.2.0.patch b/eclipse-m2e-core-fix-m2e.core-manifest-1.2.0.patch index b219e8a..9821eb7 100644 --- a/eclipse-m2e-core-fix-m2e.core-manifest-1.2.0.patch +++ b/eclipse-m2e-core-fix-m2e.core-manifest-1.2.0.patch @@ -1,12 +1,13 @@ --- org.eclipse.m2e.core/META-INF/MANIFEST.MF.orig 2012-12-05 17:01:35.124604249 +0000 +++ org.eclipse.m2e.core/META-INF/MANIFEST.MF 2012-12-05 17:02:55.092040497 +0000 -@@ -13,9 +13,9 @@ +@@ -13,9 +13,10 @@ org.eclipse.m2e.archetype.common;bundle-version="[1.2.0,1.3.0)", org.eclipse.m2e.maven.indexer;bundle-version="[1.2.0,1.3.0)", slf4j.api, - com.ning.async-http-client;bundle-version="[1.6.5,1.6.6)" + com.ning.async-http-client, -+ org.apache.maven.archetype.catalog ++ org.apache.maven.archetype.catalog, ++ org.apache.maven.archetype.descriptor Eclipse-LazyStart: true -Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: J2SE-1.5, diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec index dc38b69..5bd2ce9 100644 --- a/eclipse-m2e-core.spec +++ b/eclipse-m2e-core.spec @@ -6,7 +6,7 @@ Name: eclipse-m2e-core Version: 1.2.0 -Release: 0.1%{?dist} +Release: 0.2%{?dist} Summary: Maven integration for Eclipse Group: Development/Tools @@ -375,6 +375,9 @@ unzip -q -d %{buildroot}%{install_loc_features}/org.eclipse.m2e.feature-%{versio %changelog +* Tue Dec 11 2012 Gerard Ryan - 1.2.0-0.2 +- Require org.apache.maven.archetype.descriptor in OSGi for m2e.core. + * Mon Dec 10 2012 Gerard Ryan - 1.2.0-0.1 - Attempt update to upstream 1.2.0