summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Fedora Unity) <kanarip@fedoraunity.org>2009-12-21 18:03:33 +0100
committerJeroen van Meeuwen (Fedora Unity) <kanarip@fedoraunity.org>2009-12-21 18:03:33 +0100
commit2a27341fab6f7f8b34ce42d50de4b086cdb8b87c (patch)
tree1d0cf1f20de909216f631873a1a1d61dc1bbef63
parente2b8c05c48138e3483609fb58fbffdc0ac74dc57 (diff)
downloadruby-specs-2a27341fab6f7f8b34ce42d50de4b086cdb8b87c.tar.gz
ruby-specs-2a27341fab6f7f8b34ce42d50de4b086cdb8b87c.tar.xz
ruby-specs-2a27341fab6f7f8b34ce42d50de4b086cdb8b87c.zip
Provide a safety net in case /etc/rpm/macros.ruby is missing (such as on koji right now)
-rw-r--r--ruby-1.8.6.spec13
-rw-r--r--ruby-1.9.1.spec13
2 files changed, 26 insertions, 0 deletions
diff --git a/ruby-1.8.6.spec b/ruby-1.8.6.spec
index 47d313b..0a3b743 100644
--- a/ruby-1.8.6.spec
+++ b/ruby-1.8.6.spec
@@ -7,6 +7,19 @@
# The patchlevel
%global _patchlevel 383
+##
+## Safety net for missing /etc/rpm/macros.ruby
+##
+%{!?ruby_sitelib: %global ruby_sitelib %{_prefix}/local/share/ruby/}
+%{!?ruby_sitearch: %global ruby_sitearch %{_prefix}/local/%{_lib}/ruby/}
+%{!?ruby_vendorlib: %global ruby_vendorlib %{_datadir}/ruby/}
+%{!?ruby_vendorarch: %global ruby_vendorarch %{_libdir}/ruby/}
+
+%{!?ruby_sitelib_186: %global ruby_sitelib_186 %{_prefix}/local/share/ruby/1.8.6/}
+%{!?ruby_sitearch_186: %global ruby_sitearch_186 %{_prefix}/local/%{_lib}/ruby/1.8.6/}
+%{!?ruby_vendorlib_186: %global ruby_vendorlib_186 %{_datadir}/ruby/1.8.6/}
+%{!?ruby_vendorarch_186: %global ruby_vendorarch_186 %{_libdir}/ruby/1.8.6/}
+
# Work on some of the defined variables to get the things we
# want (need)
%global dotpatchlevel %{?_patchlevel:.%{_patchlevel}}
diff --git a/ruby-1.9.1.spec b/ruby-1.9.1.spec
index 964e854..c13ad26 100644
--- a/ruby-1.9.1.spec
+++ b/ruby-1.9.1.spec
@@ -7,6 +7,19 @@
# The patchlevel
%global _patchlevel 376
+##
+## Safety net for missing /etc/rpm/macros.ruby
+##
+%{!?ruby_sitelib: %global ruby_sitelib %{_prefix}/local/share/ruby/}
+%{!?ruby_sitearch: %global ruby_sitearch %{_prefix}/local/%{_lib}/ruby/}
+%{!?ruby_vendorlib: %global ruby_vendorlib %{_datadir}/ruby/}
+%{!?ruby_vendorarch: %global ruby_vendorarch %{_libdir}/ruby/}
+
+%{!?ruby_sitelib_191: %global ruby_sitelib_186 %{_prefix}/local/share/ruby/1.9.1/}
+%{!?ruby_sitearch_191: %global ruby_sitearch_186 %{_prefix}/local/%{_lib}/ruby/1.9.1/}
+%{!?ruby_vendorlib_191: %global ruby_vendorlib_186 %{_datadir}/ruby/1.9.1/}
+%{!?ruby_vendorarch_191: %global ruby_vendorarch_186 %{_libdir}/ruby/1.9.1/}
+
# Work on some of the defined variables to get the things we
# want (need)
%global dotpatchlevel %{?_patchlevel:.%{_patchlevel}}