Merge branch 'master' into f18

This commit is contained in:
Vít Ondruch 2012-08-14 14:33:05 +02:00
commit fe62b1ec08

View File

@ -56,7 +56,7 @@ Version: %{ruby_version_patch_level}
# we cannot reset the release number to 1 even when the main (ruby) version
# is updated - because it may be that the versions of sub-components don't
# change.
Release: 15%{?dist}
Release: 16%{?dist}
Group: Development/Languages
# Public Domain for example for: include/ruby/st.h, strftime.c, ...
License: (Ruby or BSD) and Public Domain
@ -93,6 +93,7 @@ Patch9: rubygems-1.8.11-binary-extensions.patch
Patch12: ruby-1.9.3-mkmf-verbose.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: ruby(rubygems) >= %{rubygems_version}
# Make the bigdecimal gem a runtime dependency of Ruby to avoid problems
# with user-installed gems, that don't require it in gemspec/Gemfile
# See https://bugzilla.redhat.com/show_bug.cgi?id=829209
@ -132,7 +133,6 @@ Ruby or an application embedding Ruby.
Summary: Libraries necessary to run Ruby
Group: Development/Libraries
License: Ruby or BSD
Requires: ruby(rubygems) >= %{rubygems_version}
Provides: ruby(abi) = %{ruby_abi}
%description libs
@ -726,6 +726,9 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib
%changelog
* Tue Aug 14 2012 Vít Ondruch <vondruch@redhat.com> - 1.9.3.194-16
- Revert the dependency of ruby-libs on rubygems (rhbz#845011, rhbz#847482).
* Wed Aug 01 2012 Vít Ondruch <vondruch@redhat.com> - 1.9.3.194-15
- ruby-libs must require rubygems (rhbz#845011).