[ruby/f19] Make Ruby buildable without rubypick.
Vít Ondruch
vondruch at fedoraproject.org
Thu Mar 21 12:32:32 UTC 2013
commit 1757c4302bbced6ad76e66db7641128d84e3019d
Author: Vít Ondruch <vondruch at redhat.com>
Date: Thu Mar 21 13:26:25 2013 +0100
Make Ruby buildable without rubypick.
ruby.spec | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/ruby.spec b/ruby.spec
index b2be51c..40c3bcb 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -26,7 +26,7 @@
%endif
-%global release 4
+%global release 5
%{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
%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/')
+%if 0%{?fedora} >= 19
+%global with_rubypick 1
+%endif
+
Summary: An interpreter of object-oriented scripting language
Name: ruby
Version: %{ruby_version_patch_level}
@@ -419,7 +423,7 @@ rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
# 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.
# http://bugs.ruby-lang.org/issues/7807
@@ -585,7 +589,7 @@ make check TESTS="-v $DISABLE_TESTS"
%doc GPL
%doc LEGAL
%{_bindir}/erb
-%{_bindir}/%{name}-mri
+%{_bindir}/%{name}%{?with_rubypick:-mri}
%{_bindir}/testrb
%{_mandir}/man1/erb*
%{_mandir}/man1/ruby*
@@ -863,6 +867,9 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib
%changelog
+* Thu Mar 21 2013 Vít Ondruch <vondruch at redhat.com> - 2.0.0.0-5
+- Make Ruby buildable without rubypick.
+
* Fri Mar 08 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 2.0.0.0-4
- Don't mark rpm config file as %%config (fpc#259)
More information about the scm-commits
mailing list