diff --git a/eclipse.spec b/eclipse.spec index dfac592..6678882 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -949,7 +949,7 @@ install -p -D -m0644 %{SOURCE2} \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop sed --in-place "s/eclipse.product=org.eclipse.sdk.ide/#eclipse.product=/" \ - $RPM_BUILD_ROOT%{eclipse_base}/configuration/config.ini + $RPM_BUILD_ROOT%{_datadir}/%{name}/configuration/config.ini %if %{fedora} # Put Fedora Core version into about.mappings of org.eclipse.sdk to show it in @@ -1132,7 +1132,7 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi sed --in-place "s/#eclipse.product=/eclipse.product=org.eclipse.platform.ide/" \ - %{eclipse_base}/configuration/config.ini + %{_datadir}/%{name}/configuration/config.ini %postun platform %if %{gcj_support} @@ -1143,7 +1143,21 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi sed --in-place "s/eclipse.product=org.eclipse.platform.ide/#eclipse.product=/" \ - %{eclipse_base}/configuration/config.ini + %{_datadir}/%{name}/configuration/config.ini + +%post sdk +%if %{gcj_support} +%{_bindir}/rebuild-gcj-db +%endif +sed --in-place "s/eclipse.product=org.eclipse.platform.ide/eclipse.product=org.eclipse.sdk.ide/" \ + %{_datadir}/%{name}/configuration/config.ini + +%postun sdk +%if %{gcj_support} +%{_bindir}/rebuild-gcj-db +%endif +sed --in-place "s/eclipse.product=org.eclipse.sdk.ide/eclipse.product=org.eclipse.platform.ide/" \ + %{_datadir}/%{name}/configuration/config.ini %if %{gcj_support} %post ecj -p %{_bindir}/rebuild-gcj-db @@ -1168,20 +1182,6 @@ sed --in-place "s/eclipse.product=org.eclipse.platform.ide/#eclipse.product=/" \ %postun pde-sdk -p %{_bindir}/rebuild-gcj-db %endif -%post sdk -%if %{gcj_support} -%{_bindir}/rebuild-gcj-db -%endif -sed --in-place "s/eclipse.product=org.eclipse.platform.ide/eclipse.product=org.eclipse.sdk.ide/" \ - %{eclipse_base}/configuration/config.ini - -%postun sdk -%if %{gcj_support} -%{_bindir}/rebuild-gcj-db -%endif -sed --in-place "s/eclipse.product=org.eclipse.sdk.ide/eclipse.product=org.eclipse.platform.ide/" \ - %{eclipse_base}/configuration/config.ini - %files ecj %defattr(-,root,root) %dir %{_datadir}/%{name}