From 91af49a07d79d29b29745448c3d5d13a1b952394 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Wed, 13 Apr 2016 11:25:09 -0400 Subject: [PATCH] Fix ruby lib path in macros.ruby.rh-ruby23 - Resolves: rhbz#1255753 --- ruby.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ruby.spec b/ruby.spec index d6c217d..a396dba 100644 --- a/ruby.spec +++ b/ruby.spec @@ -23,7 +23,7 @@ %global ruby_archive %{ruby_archive}-%{?milestone}%{?!milestone:%{?revision:r%{revision}}} %endif -%global release 59 +%global release 60 %{!?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 @@ -532,9 +532,9 @@ done # would be wrongly evaluated during build of other packages. mkdir -p %{buildroot}%{_root_sysconfdir}/rpm install -m 644 %{SOURCE4} %{buildroot}%{_root_sysconfdir}/rpm/macros.ruby%{?scl:.%{scl}} -sed -i "s/%%{name}/%{name}/" %{buildroot}%{_root_sysconfdir}/rpm/macros.ruby%{?scl:.%{scl}} +sed -i "s/%%{pkg_name}/%{pkg_name}/" %{buildroot}%{_root_sysconfdir}/rpm/macros.ruby%{?scl:.%{scl}} install -m 644 %{SOURCE5} %{buildroot}%{_root_sysconfdir}/rpm/macros.rubygems%{?scl:.%{scl}} -sed -i "s/%%{name}/%{name}/" %{buildroot}%{_root_sysconfdir}/rpm/macros.rubygems%{?scl:.%{scl}} +sed -i "s/%%{pkg_name}/%{pkg_name}/" %{buildroot}%{_root_sysconfdir}/rpm/macros.rubygems%{?scl:.%{scl}} # Install custom operating_system.rb. mkdir -p %{buildroot}%{rubygems_dir}/rubygems/defaults @@ -954,6 +954,10 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog +* Wed Apr 13 2016 Pavel Valena +- Fix ruby lib path in macros.ruby.rh-ruby23 + - Resolves: rhbz#1255753 + * Mon Feb 22 2016 Vít Ondruch - 2.3.0-59 - Don't prefix bundling provides. - Don't enable collections for build.