From 3f6e3a805d8f903a752a4e32e94bbe7eecde56f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 22 Feb 2016 14:36:20 +0100 Subject: [PATCH] Don't prefix bundling provides. --- ruby.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/ruby.spec b/ruby.spec index 29c7066..ad94315 100644 --- a/ruby.spec +++ b/ruby.spec @@ -23,7 +23,7 @@ %global ruby_archive %{ruby_archive}-%{?milestone}%{?!milestone:%{?revision:r%{revision}}} %endif -%global release 58 +%global release 59 %{!?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 @@ -179,10 +179,10 @@ Provides: %{?scl_prefix}ruby(release) = %{ruby_release} # Virtual provides for CCAN copylibs. # https://fedorahosted.org/fpc/ticket/364 -Provides: %{?scl_prefix}bundled(ccan-build_assert) -Provides: %{?scl_prefix}bundled(ccan-check_type) -Provides: %{?scl_prefix}bundled(ccan-container_of) -Provides: %{?scl_prefix}bundled(ccan-list) +Provides: bundled(ccan-build_assert) +Provides: bundled(ccan-check_type) +Provides: bundled(ccan-container_of) +Provides: bundled(ccan-list) %description libs 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}ruby(rubygems) = %{version}-%{release} # https://github.com/rubygems/rubygems/pull/1189#issuecomment-121600910 -Provides: %{?scl_prefix}bundled(rubygem(molinillo)) = %{molinillo_version} -Provides: %{?scl_prefix}bundled(rubygem-molinillo) = %{molinillo_version} +Provides: bundled(rubygem(molinillo)) = %{molinillo_version} +Provides: bundled(rubygem-molinillo) = %{molinillo_version} BuildArch: noarch %description -n %{?scl_prefix}rubygems @@ -960,6 +960,9 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog +* Mon Feb 22 2016 Vít Ondruch - 2.3.0-59 +- Don't prefix bundling provides. + * Fri Feb 19 2016 Pavel Valena - 2.3.0-58 - Fix default_dir and default_bindir