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

Don't prefix bundling provides.

Browse Source
This commit is contained in:
Vít Ondruch 2016-02-22 14:36:20 +01:00
parent 42117fcd3d
commit 3f6e3a805d
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ruby.spec
View File

@ -23,7 +23,7 @@
%global ruby_archive %{ruby_archive}-%{?milestone}%{?!milestone:%{?revision:r%{revision}}} %global ruby_archive %{ruby_archive}-%{?milestone}%{?!milestone:%{?revision:r%{revision}}}
%endif %endif
%global release 58 %global release 59
%{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}} %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
# The RubyGems library has to stay out of Ruby directory three, since the # The RubyGems library has to stay out of Ruby directory three, since the
@ -179,10 +179,10 @@ Provides: %{?scl_prefix}ruby(release) = %{ruby_release}
# Virtual provides for CCAN copylibs. # Virtual provides for CCAN copylibs.
# https://fedorahosted.org/fpc/ticket/364 # https://fedorahosted.org/fpc/ticket/364
Provides: %{?scl_prefix}bundled(ccan-build_assert) Provides: bundled(ccan-build_assert)
Provides: %{?scl_prefix}bundled(ccan-check_type) Provides: bundled(ccan-check_type)
Provides: %{?scl_prefix}bundled(ccan-container_of) Provides: bundled(ccan-container_of)
Provides: %{?scl_prefix}bundled(ccan-list) Provides: bundled(ccan-list)
%description libs %description libs
This package includes the libruby, necessary to run Ruby. This package includes the libruby, necessary to run Ruby.
@ -204,8 +204,8 @@ Requires: %{?scl_prefix}rubygem(psych) >= %{psych_version}
Provides: %{?scl_prefix}gem = %{version}-%{release} Provides: %{?scl_prefix}gem = %{version}-%{release}
Provides: %{?scl_prefix}ruby(rubygems) = %{version}-%{release} Provides: %{?scl_prefix}ruby(rubygems) = %{version}-%{release}
# https://github.com/rubygems/rubygems/pull/1189#issuecomment-121600910 # https://github.com/rubygems/rubygems/pull/1189#issuecomment-121600910
Provides: %{?scl_prefix}bundled(rubygem(molinillo)) = %{molinillo_version} Provides: bundled(rubygem(molinillo)) = %{molinillo_version}
Provides: %{?scl_prefix}bundled(rubygem-molinillo) = %{molinillo_version} Provides: bundled(rubygem-molinillo) = %{molinillo_version}
BuildArch: noarch BuildArch: noarch
%description -n %{?scl_prefix}rubygems %description -n %{?scl_prefix}rubygems
@ -960,6 +960,9 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib %{ruby_libdir}/tkextlib
%changelog %changelog
* Mon Feb 22 2016 Vít Ondruch <vondruch@redhat.com> - 2.3.0-59
- Don't prefix bundling provides.
* Fri Feb 19 2016 Pavel Valena <pvalena@redhat.com> - 2.3.0-58 * Fri Feb 19 2016 Pavel Valena <pvalena@redhat.com> - 2.3.0-58
- Fix default_dir and default_bindir - Fix default_dir and default_bindir