From 9aa0025d3b420e7187388098bfce4f0824309453 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Jan 12 2005 20:21:27 +0000 Subject: - make jdtcore*.jar part of eclipse-ecj --- diff --git a/eclipse.spec b/eclipse.spec index c445166..79a719c 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -55,7 +55,7 @@ ExclusiveArch: i386 Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin} -Release: 0.%{eclipse_milestone}.6 +Release: 0.%{eclipse_milestone}.7 License: CPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -603,8 +603,8 @@ gcj4 -fPIC -fjni -findirect-dispatch -shared \ # Copy jdtcore.jar to %{_datadir}/java mkdir -p $RPM_BUILD_ROOT%{_datadir}/java -ln -s %{_datadir}/java/jdtcore-%{version}.jar \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/jdtcore.jar +ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtcore.jar \ + $RPM_BUILD_ROOT%{_datadir}/java/jdtcore.jar %if %selfbuild # FIXME: gcj PR 19295 @@ -625,6 +625,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(0644,root,root,0755) %dir %{_datadir}/%{name} %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_3.* +%{_datadir}/java/jdtcore*.jar %{_libdir}/%{name}/jdtcore.so %files platform -f %{name}-platform.install @@ -670,6 +671,9 @@ rm -rf $RPM_BUILD_ROOT %defattr(0644,root,root,0755) %changelog +* Wed Jan 12 2005 Andrew Overholt 3.1-0.M4.7 +- make jdtcore*.jar part of eclipse-ecj + * Wed Jan 12 2005 Andrew Overholt 3.1-0.M4.6 - use installed java-devel rpm instead of bootstrapping one