diff --git a/eclipse.spec b/eclipse.spec index 8c39a55..3643379 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -31,7 +31,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 0.RC.1%{?dist} +Release: 0.RC.2%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -1165,7 +1165,7 @@ build-jar-repository -s -p plugins/org.junit_* junit # Symlink org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar in # %{_datadir}/java/eclipse-ecj.jar for java-1.4.2-gcj-compat's "javac" mkdir -p $RPM_BUILD_ROOT%{_datadir}/java -JDTCORESUFFIX=$(ls %{_datadir}/%{name}/plugins | grep jdt.core_ | sed "s/org.eclipse.jdt.core_//") +JDTCORESUFFIX=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep jdt.core_ | sed "s/org.eclipse.jdt.core_//") ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_$JDTCORESUFFIX $RPM_BUILD_ROOT%{_datadir}/java/eclipse-ecj.jar ln -s %{_datadir}/java/eclipse-ecj.jar $RPM_BUILD_ROOT%{_datadir}/java/jdtcore.jar @@ -1205,9 +1205,9 @@ touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi -if [ -x %{_datadir}/%{name}/configuration/config.ini ]; then -sed --in-place "s/#eclipse.product=/eclipse.product=org.eclipse.platform.ide/" \ - %{_datadir}/%{name}/configuration/config.ini +if [ -f %{_datadir}/%{name}/configuration/config.ini ]; then + sed --in-place "s/#eclipse.product=/eclipse.product=org.eclipse.platform.ide/" \ + %{_datadir}/%{name}/configuration/config.ini fi %postun platform @@ -1218,27 +1218,33 @@ touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi -if [ -x %{_datadir}/%{name}/configuration/config.ini ]; then -sed --in-place "s/eclipse.product=org.eclipse.platform.ide/#eclipse.product=/" \ - %{_datadir}/%{name}/configuration/config.ini +if [ -d %{_datadir}/%{name}/features ]; then + PLATFORMDIR=$(ls %{_datadir}/%{name}/features | grep "org\.eclipse\.platform_" + if [ ! -z "$PLATFORMDIR" -a -f %{_datadir}/%{name}/configuration/config.ini ]; then + sed --in-place "s/eclipse.product=org.eclipse.platform.ide/#eclipse.product=/" \ + %{_datadir}/%{name}/configuration/config.ini + fi fi %post sdk %if %{gcj_support} %{_bindir}/rebuild-gcj-db %endif -if [ -x %{_datadir}/%{name}/configuration/config.ini ]; then -sed --in-place "s/eclipse.product=org.eclipse.platform.ide/eclipse.product=org.eclipse.sdk.ide/" \ - %{_datadir}/%{name}/configuration/config.ini +if [ -f %{_datadir}/%{name}/configuration/config.ini ]; then + sed --in-place "s/eclipse.product=org.eclipse.platform.ide/eclipse.product=org.eclipse.sdk.ide/" \ + %{_datadir}/%{name}/configuration/config.ini fi %postun sdk %if %{gcj_support} %{_bindir}/rebuild-gcj-db %endif -if [ -x %{_datadir}/%{name}/configuration/config.ini ]; then -sed --in-place "s/eclipse.product=org.eclipse.sdk.ide/eclipse.product=org.eclipse.platform.ide/" \ - %{_datadir}/%{name}/configuration/config.ini +if [ -d %{_datadir}/%{name}/features ]; then + SDKDIR=$(ls %{_datadir}/%{name}/features | grep "org\.eclipse\.sdk_" + if [ ! -z "$SDKDIR" -a -f %{_datadir}/%{name}/configuration/config.ini ]; then + sed --in-place "s/eclipse.product=org.eclipse.sdk.ide/eclipse.product=org.eclipse.platform.ide/" \ + %{_datadir}/%{name}/configuration/config.ini + fi fi %if %{gcj_support} @@ -1584,6 +1590,9 @@ fi %{_datadir}/%{name}/plugins/org.eclipse.sdk_* %changelog +* Tue Sep 26 2006 Ben Konrath 3.2.1-0.RC.2 +- Don't set eclipse.product incorrectly in %postun of -sdk and -platform. + * Mon Sep 25 2006 Ben Konrath 3.2.1-0.RC.1 - M20060921-0945 (3.2.1 pre-release). - Upadate patches to 3.2.1.