[eclipse/f17] Make org.eclipse.osgi and org.eclipse.jdt.core visible through tycho namespace.

Roland Grunberg rgrunber at fedoraproject.org
Thu Feb 23 21:07:59 UTC 2012


commit ae3a1c3743b0871ca09905b0769f28bb5791ec34
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Thu Feb 23 16:00:32 2012 -0500

    Make org.eclipse.osgi and org.eclipse.jdt.core visible through tycho
    namespace.
    
    Add org.eclipse.tycho:org.eclipse.osgi to osgi depmap.
    Install org.eclipse.jdt.core in javadir/eclipse.
    Add maven pom and depmap for org.eclipse.jdt.core.

 eclipse.spec                         |   16 ++++++++++++++--
 org.eclipse.jdt.core-3.8.0.v_C03.pom |    9 +++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index be1de14..1b14912 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:        0.13.I201202140800%{?dist}
+Release:        0.14.I201202140800%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -30,6 +30,7 @@ Source5:        http://repo1.maven.org/maven2/org/eclipse/osgi/org.eclipse.osgi/
 # 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
+Source8:		org.eclipse.jdt.core-3.8.0.v_C03.pom
 
 BuildRequires:  ant
 BuildRequires:  rsync
@@ -264,7 +265,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
 ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.osgi_*.jar osgi.jar
 popd
 install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.eclipse-osgi.pom
-%add_maven_depmap JPP.eclipse-osgi.pom %{name}/osgi.jar -a "org.eclipse:osgi"
+%add_maven_depmap JPP.eclipse-osgi.pom %{name}/osgi.jar -a "org.eclipse:osgi,org.eclipse.tycho:org.eclipse.osgi"
 
 pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
 ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.osgi.services_*.jar osgi.services.jar
@@ -278,6 +279,12 @@ popd
 install -m 0644 %{SOURCE7} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.eclipse-equinox.http.servlet.pom
 %add_maven_depmap JPP.eclipse-equinox.http.servlet.pom %{name}/equinox.http.servlet.jar -a "org.eclipse.equinox.http:servlet"
 
+pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
+ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_*.jar jdt.core.jar
+popd
+install -m 0644 %{SOURCE8} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.eclipse-jdt.core.pom
+%add_maven_depmap JPP.eclipse-jdt.core.pom %{name}/jdt.core.jar -a "org.eclipse:jdt.core,org.eclipse.tycho:org.eclipse.jdt.core"
+
 # A sanity check.
 desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
@@ -567,6 +574,11 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/dropins/sdk
 
 %changelog
+* Wed Feb 22 2012 Roland Grunberg <rgrunber at redhat.com> 1:3.8.0-0.14.I201202140800
+- Add org.eclipse.tycho:org.eclipse.osgi to osgi depmap.
+- Install org.eclipse.jdt.core in javadir/eclipse.
+- Add maven pom and depmap for org.eclipse.jdt.core.
+
 * Wed Feb 22 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:3.8.0-0.13.I201202140800
 - Updated dependencies to match jetty 8.1.0-1.
 - Updated commons-codec minimal requirements.
diff --git a/org.eclipse.jdt.core-3.8.0.v_C03.pom b/org.eclipse.jdt.core-3.8.0.v_C03.pom
new file mode 100644
index 0000000..4da0cc0
--- /dev/null
+++ b/org.eclipse.jdt.core-3.8.0.v_C03.pom
@@ -0,0 +1,9 @@
+<?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>
+  <groupId>org.eclipse.jdt</groupId>
+  <artifactId>core</artifactId>
+  <version>3.8.0.v_C03</version>
+  <description>OSGi System Bundle %systemBundle</description>
+  <!-- See https://issues.sonatype.org/browse/OSSRH-739 -->
+</project>


More information about the scm-commits mailing list