Define %%{_eclipse_base} to properly resolve %%{_libdir} for noarch.

This commit is contained in:
Roland Grunberg 2012-04-04 09:58:56 -04:00
parent 13216d3b93
commit d30270eba2
2 changed files with 8 additions and 2 deletions

View File

@ -20,7 +20,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_version}
Release: 0.4.fa15ab%{?dist}
Release: 0.5.fa15ab%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@ -661,6 +661,9 @@ rm -rf %{_bindir}/efj/
%{_libdir}/%{name}/dropins/sdk
%changelog
* Wed Apr 4 2012 Roland Grunberg <rgrunber@redhat.com> 1:4.2.0-0.5.fa15ab
- Define %%{_eclipse_base} to properly resolve %%{_libdir} for noarch.
* Mon Apr 2 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.4.fa15ab
- pdebuild script installed into %{_bindir}

View File

@ -1,4 +1,7 @@
# RPM macros for eclipse packages.
#
%_eclipse_base %{_libdir}/eclipse
# There is no guarantee that %%{_libdir} will resolve properly on
# noarch so we use this macro.
%_eclipse_bits %(rpm --eval %{__isa_bits} | sed 's/32//')
%_eclipse_base %{_prefix}/lib%{_eclipse_bits}/eclipse