diff --git a/eclipse.spec b/eclipse.spec index 8767093..769b537 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -16,7 +16,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 6%{?dist} +Release: 7%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -25,13 +25,13 @@ Source1: %{download_url}eclipse-3.7.0-src.tar.bz2 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 BuildRequires: ant BuildRequires: rsync BuildRequires: jpackage-utils >= 0:1.5, make, gcc BuildRequires: gtk2-devel BuildRequires: glib2-devel -BuildRequires: libgnome-devel BuildRequires: gcc-c++ BuildRequires: nspr-devel BuildRequires: libXtst-devel @@ -203,6 +203,8 @@ rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/icon.xpm # Some directories we need install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java +install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name} +install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} pushd $RPM_BUILD_ROOT%{_libdir}/%{name} # Create file listings for the extracted shared libraries @@ -251,6 +253,13 @@ pushd $RPM_BUILD_ROOT%{_libdir}/%{name} ln -s ../%{name}/swt.jar ../java/swt.jar popd +# OSGI JAR symlink in javadir and maven depmap +pushd $RPM_BUILD_ROOT%{_javadir}/%{name} +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" + # A sanity check. desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop @@ -455,6 +464,9 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_* %{_libdir}/%{name}/plugins/org.eclipse.update.configurator_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator_* +%{_javadir}/%{name} +%{_mavenpomdir}/* +%{_mavendepmapfragdir}/* %if %{initialize} %files platform -f %{name}-platform.install @@ -627,6 +639,10 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/dropins/sdk %changelog +* Fri Oct 21 2011 Alexander Kurtakov 1:3.7.0-7 +- Install org.eclipse.osgi in javadir/eclipse/osgi.jar +- Add maven pom and depmap. + * Thu Oct 20 2011 Sami Wagiaalla 1:3.7.0-6 - Bump the release number. diff --git a/org.eclipse.osgi-3.6.0.v20100517.pom b/org.eclipse.osgi-3.6.0.v20100517.pom new file mode 100644 index 0000000..15b5e66 --- /dev/null +++ b/org.eclipse.osgi-3.6.0.v20100517.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + org.eclipse.osgi + org.eclipse.osgi + 3.6.0.v20100517 + OSGi System Bundle %systemBundle + + \ No newline at end of file