- Move rcp feature to %%{_libdir} to avoid multilib conflict on ppc{,64}.
This commit is contained in:
parent
11b3b7d47a
commit
d563cf56fe
12
eclipse.spec
12
eclipse.spec
@ -19,7 +19,7 @@ Epoch: 1
|
|||||||
Summary: An open, extensible IDE
|
Summary: An open, extensible IDE
|
||||||
Name: eclipse
|
Name: eclipse
|
||||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||||
Release: 36%{?dist}
|
Release: 37%{?dist}
|
||||||
License: Eclipse Public License
|
License: Eclipse Public License
|
||||||
Group: Text Editors/Integrated Development Environments (IDE)
|
Group: Text Editors/Integrated Development Environments (IDE)
|
||||||
URL: http://www.eclipse.org/
|
URL: http://www.eclipse.org/
|
||||||
@ -972,6 +972,11 @@ PDEDOCUSERVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep pde.doc
|
|||||||
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.pde.doc.user_$PDEDOCUSERVERSION \
|
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.pde.doc.user_$PDEDOCUSERVERSION \
|
||||||
$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
|
$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
|
||||||
|
|
||||||
|
# Adding support for ppc64, s390{x} and sparc{64} makes the rcp feature
|
||||||
|
# have multilib conflicts
|
||||||
|
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/features/org.eclipse.rcp_* \
|
||||||
|
$RPM_BUILD_ROOT%{_libdir}/%{name}/features
|
||||||
|
|
||||||
# To ensure that the product is org.eclipse.sdk.ide when eclipse-sdk is
|
# To ensure that the product is org.eclipse.sdk.ide when eclipse-sdk is
|
||||||
# installed, we must check for its presence at %%post{,un} time. This does not
|
# installed, we must check for its presence at %%post{,un} time. This does not
|
||||||
# work in the biarch case, though, if it is not in an arch-specific location.
|
# work in the biarch case, though, if it is not in an arch-specific location.
|
||||||
@ -1476,7 +1481,7 @@ fi
|
|||||||
%{_datadir}/%{name}/about_files
|
%{_datadir}/%{name}/about_files
|
||||||
%endif
|
%endif
|
||||||
%{_datadir}/%{name}/readme
|
%{_datadir}/%{name}/readme
|
||||||
%{_datadir}/%{name}/features/org.eclipse.rcp_*
|
%{_libdir}/%{name}/features/org.eclipse.rcp_*
|
||||||
%{_datadir}/%{name}/plugins/org.eclipse.update.configurator_*
|
%{_datadir}/%{name}/plugins/org.eclipse.update.configurator_*
|
||||||
%{_datadir}/%{name}/plugins/org.eclipse.osgi_*
|
%{_datadir}/%{name}/plugins/org.eclipse.osgi_*
|
||||||
%{_datadir}/%{name}/plugins/org.eclipse.equinox.registry_*
|
%{_datadir}/%{name}/plugins/org.eclipse.equinox.registry_*
|
||||||
@ -1742,6 +1747,9 @@ fi
|
|||||||
%{_libdir}/%{name}/plugins/org.eclipse.sdk_*
|
%{_libdir}/%{name}/plugins/org.eclipse.sdk_*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Feb 07 2007 Ben Konrath <bkonrath@redhat.com> 3.2.1-37
|
||||||
|
- Move rcp feature to %%{_libdir} to avoid multilib conflict on ppc{,64}.
|
||||||
|
|
||||||
* Tue Feb 06 2007 Ben Konrath <bkonrath@redhat.com> 3.2.1-36
|
* Tue Feb 06 2007 Ben Konrath <bkonrath@redhat.com> 3.2.1-36
|
||||||
- Rework ppc64, s390{x} and sparc{64} hack again to try to fix multilib
|
- Rework ppc64, s390{x} and sparc{64} hack again to try to fix multilib
|
||||||
problem.
|
problem.
|
||||||
|
Loading…
Reference in New Issue
Block a user