From a3ce5dae3fe775d58d9db19dd37dcbf9fa9face0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Jul 07 2015 10:19:40 +0000 Subject: Add Maven metadata for SWT --- diff --git a/eclipse.spec b/eclipse.spec index 0c7ef86..b166fa1 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -37,7 +37,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_version} -Release: 3%{?dist} +Release: 4%{?dist} License: EPL URL: http://www.eclipse.org/ @@ -719,7 +719,7 @@ popd # Symlink SWT jar pushd $RPM_BUILD_ROOT/%{_jnidir}/ - ln -s %{_libdir}/%{pkg_name}/swt.jar + ln -s $(abs2rel %{_libdir}/%{pkg_name}/swt.jar %{_jnidir}) popd # Symlink eclipse ini @@ -747,12 +747,15 @@ for J in $EQUINOX_JARS $OSGI_JARS core.contenttype core.jobs core.net core.runti fi done -# Install maven depmaps for OSGI jars +# Install Maven metadata for OSGi jars %add_maven_depmap JPP.eclipse-osgi.pom %{pkg_name}/osgi.jar -a "org.eclipse:osgi,org.eclipse.tycho:org.eclipse.osgi" -f equinox-osgi %add_maven_depmap JPP.eclipse-osgi.compatibility.state.pom %{pkg_name}/osgi.compatibility.state.jar -a "org.eclipse.osgi:compatibility.state,org.eclipse.tycho:org.eclipse.osgi.compatibility.state" -f equinox-osgi %add_maven_depmap JPP.eclipse-osgi.services.pom %{pkg_name}/osgi.services.jar -a "org.eclipse.osgi:services" -f equinox-osgi %add_maven_depmap JPP.eclipse-osgi.util.pom %{pkg_name}/osgi.util.jar -a "org.eclipse.osgi:util" -f equinox-osgi %add_maven_depmap JPP.eclipse-equinox.http.servlet.pom %{pkg_name}/equinox.http.servlet.jar -a "org.eclipse.equinox.http:servlet" -f platform +# Maven metadata for SWT (no POM) +VER=$(echo $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.swt_*.jar | sed -e "s/.*_\(.*\)\.jar/\1/") +%add_maven_depmap org.eclipse.swt:org.eclipse.swt:$VER swt.jar -a org.eclipse.swt:swt -f swt # Install the Copy Platform script install -p -D -m0755 pdebuildscripts/eclipse-copy-platform.sh \ @@ -855,7 +858,7 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q /usr/share/icons/hicolor fi -%files swt +%files swt -f .mfiles-swt %{_libdir}/%{pkg_name}/eclipse.ini %{_libdir}/%{pkg_name}/plugins/org.eclipse.swt_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.swt.gtk.linux.* @@ -1093,6 +1096,9 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_* %changelog +* Tue Jul 7 2015 Mikolaj Izdebski - 1:4.5.0-4 +- Add Maven metadata for SWT + * Thu Jul 02 2015 Sopot Cela 1:4.5.0-3 - Patch dark theme patch to work on rawhide