rpms/ruby
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use standardized multilib solution (rhbz#1412274).

Browse Source 
This helps platform specific difference between builds.
This commit is contained in:
Vít Ondruch 2017-02-03 15:01:34 +01:00
parent 415daf8d3b
commit c467007dbb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruby.spec
View File

@ -156,6 +156,7 @@ BuildRequires: git
BuildRequires: %{_bindir}/cmake BuildRequires: %{_bindir}/cmake
# Required to test hardening. # Required to test hardening.
BuildRequires: %{_bindir}/checksec BuildRequires: %{_bindir}/checksec
BuildRequires: multilib-rpm-config
# This package provides %%{_bindir}/ruby-mri therefore it is marked by this # This package provides %%{_bindir}/ruby-mri therefore it is marked by this
# virtual provide. It can be installed as dependency of rubypick. # virtual provide. It can be installed as dependency of rubypick.
@ -557,8 +558,7 @@ make install DESTDIR=%{buildroot}
# Rename ruby/config.h to ruby/config-<arch>.h to avoid file conflicts on # Rename ruby/config.h to ruby/config-<arch>.h to avoid file conflicts on
# multilib systems and install config.h wrapper # multilib systems and install config.h wrapper
mv %{buildroot}%{_includedir}/%{name}/config.h %{buildroot}%{_includedir}/%{name}/config-%{_arch}.h %multilib_fix_c_header --file %{_includedir}/%{name}/config.h
install -m644 %{SOURCE7} %{buildroot}%{_includedir}/%{name}/config.h
# Rename the ruby executable. It is replaced by RubyPick. # Rename the ruby executable. It is replaced by RubyPick.
%{?with_rubypick:mv %{buildroot}%{_bindir}/%{name}{,-mri}} %{?with_rubypick:mv %{buildroot}%{_bindir}/%{name}{,-mri}}
@ -1026,6 +1026,7 @@ make check TESTS="-v $DISABLE_TESTS"
%changelog %changelog
* Fri Feb 03 2017 Vít Ondruch <vondruch@redhat.com> - 2.4.0-76 * Fri Feb 03 2017 Vít Ondruch <vondruch@redhat.com> - 2.4.0-76
- Fix GCC 7.x compatibility (rhbz#1417590). - Fix GCC 7.x compatibility (rhbz#1417590).
- Use standardized multilib solution (rhbz#1412274).
* Tue Jan 17 2017 Vít Ondruch <vondruch@redhat.com> - 2.4.0-75 * Tue Jan 17 2017 Vít Ondruch <vondruch@redhat.com> - 2.4.0-75
- Apply patch fixing rubygem-mongo build failures. - Apply patch fixing rubygem-mongo build failures.