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

Fix ruby lib path in macros.ruby.rh-ruby23

Browse Source 
- Resolves: rhbz#1255753
This commit is contained in:
Pavel Valena 2016-04-13 11:25:09 -04:00
parent 651be7da37
commit 91af49a07d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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 59 %global release 60
%{!?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
@ -532,9 +532,9 @@ done
# would be wrongly evaluated during build of other packages. # would be wrongly evaluated during build of other packages.
mkdir -p %{buildroot}%{_root_sysconfdir}/rpm mkdir -p %{buildroot}%{_root_sysconfdir}/rpm
install -m 644 %{SOURCE4} %{buildroot}%{_root_sysconfdir}/rpm/macros.ruby%{?scl:.%{scl}} 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}} 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. # Install custom operating_system.rb.
mkdir -p %{buildroot}%{rubygems_dir}/rubygems/defaults mkdir -p %{buildroot}%{rubygems_dir}/rubygems/defaults
@ -954,6 +954,10 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib %{ruby_libdir}/tkextlib
%changelog %changelog
* Wed Apr 13 2016 Pavel Valena <pvalena@redhat.com>
- Fix ruby lib path in macros.ruby.rh-ruby23
- Resolves: rhbz#1255753
* Mon Feb 22 2016 Vít Ondruch <vondruch@redhat.com> - 2.3.0-59 * Mon Feb 22 2016 Vít Ondruch <vondruch@redhat.com> - 2.3.0-59
- Don't prefix bundling provides. - Don't prefix bundling provides.
- Don't enable collections for build. - Don't enable collections for build.