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.
This commit is contained in:
Roland Grunberg 2012-02-23 16:00:32 -05:00
parent 2e96024e84
commit ae3a1c3743
2 changed files with 23 additions and 2 deletions

View File

@ -17,7 +17,7 @@ Epoch: 1
Summary: An open, extensible IDE Summary: An open, extensible IDE
Name: eclipse Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro} Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 0.13.I201202140800%{?dist} Release: 0.14.I201202140800%{?dist}
License: EPL License: EPL
Group: Text Editors/Integrated Development Environments (IDE) Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/ 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 # Patched to remove fake parent
Source6: org.eclipse.osgi.services-3.2.100.v20100503.pom 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 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: ant
BuildRequires: rsync BuildRequires: rsync
@ -264,7 +265,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.osgi_*.jar osgi.jar ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.osgi_*.jar osgi.jar
popd popd
install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.eclipse-osgi.pom 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 pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.osgi.services_*.jar osgi.services.jar 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 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" %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. # A sanity check.
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
@ -567,6 +574,11 @@ rm -rf %{_bindir}/efj/
%{_libdir}/%{name}/dropins/sdk %{_libdir}/%{name}/dropins/sdk
%changelog %changelog
* Wed Feb 22 2012 Roland Grunberg <rgrunber@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@redhat.com> 1:3.8.0-0.13.I201202140800 * Wed Feb 22 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:3.8.0-0.13.I201202140800
- Updated dependencies to match jetty 8.1.0-1. - Updated dependencies to match jetty 8.1.0-1.
- Updated commons-codec minimal requirements. - Updated commons-codec minimal requirements.

View File

@ -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>