rpms/ruby
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make Ruby buildable without rubypick.

Browse Source
This commit is contained in:
Vít Ondruch 2013-03-21 13:26:25 +01:00
parent bc925acb7d
commit 1757c4302b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ruby.spec
View File

@ -26,7 +26,7 @@
%endif %endif
%global release 4 %global release 5
%{!?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}}
%global ruby_libdir %{_datadir}/%{name} %global ruby_libdir %{_datadir}/%{name}
@ -75,6 +75,10 @@
%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/') %global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/')
%if 0%{?fedora} >= 19
%global with_rubypick 1
%endif
Summary: An interpreter of object-oriented scripting language Summary: An interpreter of object-oriented scripting language
Name: ruby Name: ruby
Version: %{ruby_version_patch_level} Version: %{ruby_version_patch_level}
@ -419,7 +423,7 @@ rm -rf %{buildroot}
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
# Rename the ruby executable. It is replaced by RubyPick. # Rename the ruby executable. It is replaced by RubyPick.
mv %{buildroot}%{_bindir}/%{name}{,-mri} %{?with_rubypick:mv %{buildroot}%{_bindir}/%{name}{,-mri}}
# Version is empty if --with-ruby-version is specified. # Version is empty if --with-ruby-version is specified.
# http://bugs.ruby-lang.org/issues/7807 # http://bugs.ruby-lang.org/issues/7807
@ -585,7 +589,7 @@ make check TESTS="-v $DISABLE_TESTS"
%doc GPL %doc GPL
%doc LEGAL %doc LEGAL
%{_bindir}/erb %{_bindir}/erb
%{_bindir}/%{name}-mri %{_bindir}/%{name}%{?with_rubypick:-mri}
%{_bindir}/testrb %{_bindir}/testrb
%{_mandir}/man1/erb* %{_mandir}/man1/erb*
%{_mandir}/man1/ruby* %{_mandir}/man1/ruby*
@ -863,6 +867,9 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib %{ruby_libdir}/tkextlib
%changelog %changelog
* Thu Mar 21 2013 Vít Ondruch <vondruch@redhat.com> - 2.0.0.0-5
- Make Ruby buildable without rubypick.
* Fri Mar 08 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.0.0.0-4 * Fri Mar 08 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.0.0.0-4
- Don't mark rpm config file as %%config (fpc#259) - Don't mark rpm config file as %%config (fpc#259)