[eclipse] Remove o.e.osgi.services parent.

Alexander Kurtakov akurtakov at fedoraproject.org
Mon Jan 16 11:25:03 UTC 2012


commit 55ff88e237730d1e2b4b939e5769c19ecb037718
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Mon Jan 16 13:24:25 2012 +0200

    Remove o.e.osgi.services parent.

 eclipse.spec                                    |    9 +++++++--
 org.eclipse.osgi.services-3.2.100.v20100503.pom |    5 -----
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index 317dce4..76ee7c8 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -17,7 +17,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        12%{?dist}
+Release:        13%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -27,7 +27,9 @@ Source2:        eclipse-reconciler.sh
 Source3:        %{name}-tmpfiles.conf
 Source4:        macros.%{name}
 Source5:        http://repo1.maven.org/maven2/org/eclipse/osgi/org.eclipse.osgi/3.6.0.v20100517/org.eclipse.osgi-3.6.0.v20100517.pom
-Source6:        http://repo1.maven.org/maven2/org/eclipse/osgi/org.eclipse.osgi.services/3.2.100.v20100503/org.eclipse.osgi.services-3.2.100.v20100503.pom
+# Fetched from http://repo1.maven.org/maven2/org/eclipse/osgi/org.eclipse.osgi.services/3.2.100.v20100503/org.eclipse.osgi.services-3.2.100.v20100503.pom
+# Patched to remove fake parent
+Source6:        org.eclipse.osgi.services-3.2.100.v20100503.pom
 Source7:        http://repo1.maven.org/maven2/org/eclipse/equinox/http/servlet/1.0.0-v20070606/servlet-1.0.0-v20070606.pom
 
 BuildRequires:  ant
@@ -645,6 +647,9 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/dropins/sdk
 
 %changelog
+* Fri Jan 16 2012 Alexander Kurtakov <akurtako at redhat.com> - 1:3.7.1-13
+- Fix o.e.osgi.services pom to remove fake parent.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.7.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/org.eclipse.osgi.services-3.2.100.v20100503.pom b/org.eclipse.osgi.services-3.2.100.v20100503.pom
index 83be188..633dc87 100644
--- a/org.eclipse.osgi.services-3.2.100.v20100503.pom
+++ b/org.eclipse.osgi.services-3.2.100.v20100503.pom
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xsi:noNamespaceSchemaLocation="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>org.eclipse.eclipse</artifactId>
-    <groupId>org.eclipse</groupId>
-    <version>3.6.0.v20100505</version>
-  </parent>
   <groupId>org.eclipse.osgi</groupId>
   <artifactId>org.eclipse.osgi.services</artifactId>
   <version>3.2.100.v20100503</version>


More information about the scm-commits mailing list