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

Fix macros.ruby and macros.rubygems

Browse Source 
Fixes also failing tests
This commit is contained in:
Pavel Valena 2016-02-18 16:59:56 +01:00
parent 9ce30b769c
commit abf7eb2088
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
macros.ruby
View File

@ -1,10 +1,10 @@
%ruby_libdir %{_datadir}/%{name}
%ruby_libarchdir %{_libdir}/%{name}
%ruby_libdir %{_datadir}/%{pkg_name}
%ruby_libarchdir %{_libdir}/%{pkg_name}
# This is the local lib/arch and should not be used for packaging.
%ruby_sitedir site_ruby
%ruby_sitelibdir %{_prefix}/local/share/%{name}/%{ruby_sitedir}
%ruby_sitearchdir %{_prefix}/local/%{_lib}/%{name}/%{ruby_sitedir}
%ruby_sitelibdir %{_prefix}/local/share/%{pkg_name}/%{ruby_sitedir}
%ruby_sitearchdir %{_prefix}/local/%{_lib}/%{pkg_name}/%{ruby_sitedir}
# This is the general location for libs/archs compatible with all
# or most of the Ruby versions available in the Fedora repositories.

2
macros.rubygems
View File

@ -4,7 +4,7 @@
# Common gem locations and files.
%gem_instdir %{gem_dir}/gems/%{gem_name}-%{version}
%gem_extdir_mri %{gem_archdir}/%{name}/%{gem_name}-%{version}
%gem_extdir_mri %{gem_archdir}/ruby/%{gem_name}-%{version}
%gem_libdir %{gem_instdir}/lib
%gem_cache %{gem_dir}/cache/%{gem_name}-%{version}.gem
%gem_spec %{gem_dir}/specifications/%{gem_name}-%{version}.gemspec

7
ruby.spec
View File

@ -23,7 +23,7 @@
%global ruby_archive %{ruby_archive}-%{?milestone}%{?!milestone:%{?revision:r%{revision}}}
%endif
%global release 55
%global release 56
%{!?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
@ -631,7 +631,7 @@ sed -i 's/^/%lang(ja) /' .ruby-doc.ja
%{?scl:scl enable %scl - << \EOF
mkdir -p ./lib/rubygems/defaults
cp %{SOURCE1} ./lib/rubygems/defaults
make test-all TESTS="%{SOURCE14}" | grep '2 failures, 0 errors' || exit 1
make test-all TESTS="%{SOURCE14}" || exit 1
rm -rf ./lib/rubygems/defaults
EOF}
@ -962,6 +962,9 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib
%changelog
* Thu Feb 18 2016 Pavel Valena <pvalena@redhat.com> - 2.3.0-56
- Fix macros.ruby and macros.rubygems
* Wed Feb 17 2016 Pavel Valena <pvalena@redhat.com> - 2.3.0-55
- Add scl macros