commit c314e53ccaad7b567d666a8fceb6b8cec469210a
Author: Elan Ruusamäe <[email protected]>
Date: Mon Nov 11 20:32:14 2013 +0200
set default ruby_suffix based on bcond and distro default
ruby.spec | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/ruby.spec b/ruby.spec
index db794cd..8bc360d 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -6,12 +6,15 @@
%bcond_with default_ruby # use this Ruby as default system Ruby
%bcond_with onigurma
-%if "%{pld_release}" == "th"
-%define ruby_suffix 18
-%else
-%define ruby_suffix %{nil}
+# in ac enable with default_ruby
+%if "%{pld_release}" == "ac" && 0%{!?_without_default_ruby:1}
+# if commandline --without was given. respect that
+%define with_default_ruby 1
%endif
+
+%define ver_suffix 18
%define ruby_ver 1.8
+%define ruby_suffix %{!?with_default_ruby:%{ver_suffix}}
%define ruby_ridir %{_datadir}/ri/%{ruby_ver}/system
%define ruby_rdocdir %{_datadir}/rdoc
%define stdlibdoc_version 0.10.1
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby.git/commitdiff/c314e53ccaad7b567d666a8fceb6b8cec469210a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
