rpms/ruby
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- Avoid multilib conflict on -libs subpackage (bug 649174)

Browse Source
This commit is contained in:
Mamoru Tasaka 2010-11-04 04:25:56 +09:00
parent 1f8d8f93ae
commit 8a9a71d5bd
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ruby.spec
View File

@ -17,7 +17,7 @@
Name: ruby Name: ruby
Version: %{rubyver}%{?dotpatchlevel} Version: %{rubyver}%{?dotpatchlevel}
Release: 1%{?dist} Release: 2%{?dist}
# Please check if ruby upstream changes this to "Ruby or GPLv2+" # Please check if ruby upstream changes this to "Ruby or GPLv2+"
License: Ruby or GPLv2 License: Ruby or GPLv2
URL: http://www.ruby-lang.org/ URL: http://www.ruby-lang.org/
@ -230,6 +230,22 @@ make OPT=-O0 RUBY_INSTALL_NAME=ruby \
%{?_smp_mflags} %{?_smp_mflags}
%endif %endif
# Avoid multilib conflict on -libs (bug 649174)
# Maybe dlconfig.rb is unneeded anyway, however for now moving
# dlconfig.rb and add wrapper (need checking)
CONFIGARCH=$(./miniruby -rrbconfig -e "puts Config::CONFIG['arch']")
[ -z "$CONFIGARCH" ] && exit 1
pushd ext/dl
mkdir $CONFIGARCH
mv dlconfig.rb $CONFIGARCH/
cat > dlconfig.rb <<EOF
require 'rbconfig'
dlconfig_path=File.join(File.dirname(__FILE__), Config::CONFIG['arch'], 'dlconfig')
require dlconfig_path
EOF
popd
# Generate ri doc # Generate ri doc
rm -rf .ext/rdoc rm -rf .ext/rdoc
rm -rf ./RI_TMPDIR rm -rf ./RI_TMPDIR
@ -506,6 +522,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/ri %{_datadir}/ri
%changelog %changelog
* Thu Nov 4 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.8.7.302-2
- Avoid multilib conflict on -libs subpackage (bug 649174)
* Mon Aug 23 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.8.7.302-1 * Mon Aug 23 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.8.7.302-1
- Update to 1.8.7.302 - Update to 1.8.7.302
- CVE-2010-0541 (bug 587731) is fixed in this version - CVE-2010-0541 (bug 587731) is fixed in this version