[eclipse] Make o.e.osgi.services and o.e.equinox.http.servlet usable by maven
Andrew Overholt
overholt at fedoraproject.org
Thu Dec 22 17:31:46 UTC 2011
commit d0678744b8ec95d35554d0f1814c79cb980ff600
Author: Andrew Overholt <overholt at redhat.com>
Date: Thu Dec 22 12:23:52 2011 -0500
Make o.e.osgi.services and o.e.equinox.http.servlet usable by maven
Install o.e.osgi.services and o.e.equinox.http.servlet symlinks in
javadir/eclipse and put POMs into mavenpomdir. This fixes
https://bugzilla.redhat.com/769621.
eclipse.spec | 24 ++++++++++++++++++++++--
services-3.1.200-v20070605.pom | 14 ++++++++++++++
servlet-1.0.0-v20070606.pom | 13 +++++++++++++
3 files changed, 49 insertions(+), 2 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index 1e03885..ecffc76 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: 10%{?dist}
+Release: 11%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -27,6 +27,8 @@ 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
+Source7: http://repo1.maven.org/maven2/org/eclipse/equinox/http/servlet/1.0.0-v20070606/servlet-1.0.0-v20070606.pom
BuildRequires: ant
BuildRequires: rsync
@@ -258,13 +260,25 @@ pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
ln -s ../%{name}/swt.jar ../java/swt.jar
popd
-# OSGI JAR symlink in javadir and maven depmap
+# OSGI JAR symlinks in javadir and maven depmaps
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"
+pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
+ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.osgi.services_*.jar osgi.services.jar
+popd
+install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.eclipse-osgi.services.pom
+%add_maven_depmap JPP.eclipse-osgi.services.pom %{name}/osgi.servicesjar -a "org.eclipse.osgi:services"
+
+pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
+ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.servlet_*.jar equinox.servlet.jar
+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.servlet.jar -a "org.eclipse.equinox.http:servlet"
+
# A sanity check.
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
@@ -631,6 +645,12 @@ rm -rf %{_bindir}/efj/
%{_libdir}/%{name}/dropins/sdk
%changelog
+* Thu Dec 22 2011 Andrew Overholt <overholt at redhat.com> 1:3.7.1-11
+- Install org.eclipse.osgi.services and org.eclipse.equinox.http.servlet in
+ javadir/eclipse.
+- Add maven pom and depmap for the above.
+- Fixes rhbz#769621.
+
* Tue Dec 20 2011 Andrew Robinson <arobinso at redhat.com> 1:3.7.1-10
- Specfile fix for license feature.
diff --git a/services-3.1.200-v20070605.pom b/services-3.1.200-v20070605.pom
new file mode 100644
index 0000000..7d566f4
--- /dev/null
+++ b/services-3.1.200-v20070605.pom
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>services</artifactId>
+ <name>OSGi Release 4.0.1 Services</name>
+ <version>3.1.200-v20070605</version>
+ <licenses>
+ <license>
+ <name>Eclipse Public License - v 1.0</name>
+ <url>http://www.eclipse.org/org/documents/epl-v10.html</url>
+ </license>
+ </licenses>
+</project>
\ No newline at end of file
diff --git a/servlet-1.0.0-v20070606.pom b/servlet-1.0.0-v20070606.pom
new file mode 100644
index 0000000..c9299e6
--- /dev/null
+++ b/servlet-1.0.0-v20070606.pom
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.equinox.http</groupId>
+ <artifactId>servlet</artifactId>
+ <name>Http Services Servlet</name>
+ <version>1.0.0-v20070606</version>
+ <licenses>
+ <license>
+ <name>Eclipse Public License - v 1.0</name>
+ <url>http://www.eclipse.org/org/documents/epl-v10.html</url>
+ </license>
+ </licenses>
+</project>
\ No newline at end of file
More information about the scm-commits
mailing list