[packages/rpm-build-macros] disable deprecated %ruby_ver_requires_eq, %ruby_mod_ver_requires_eq

glen glen at pld-linux.org
Mon Jun 2 14:50:39 CEST 2014


commit 55edeb4e7ac4a4f308f5aceec89d71d7e94e8412
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Jun 2 15:50:20 2014 +0300

    disable deprecated %ruby_ver_requires_eq, %ruby_mod_ver_requires_eq

 rpm.macros | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/rpm.macros b/rpm.macros
index bd6d042..3357ddf 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -943,9 +943,9 @@ fi; \
 %ruby_gemdir		%{expand:%%global ruby_gemdir %(%{__ruby} -r rubygems -e 'puts Gem.respond_to?(:default_dirs) ? Gem.default_dirs[:system][:gem_dir] : Gem.path.first' 2>/dev/null || echo ERROR)}%{ruby_gemdir}
 %ruby_specdir		%{ruby_gemdir}/specifications
 
-# deprecated, similar functionality autogenerated with rpm5
-%ruby_ver_requires_eq	Requires:	ruby(ver) = %ruby_version
-%ruby_mod_ver_requires_eq	Requires:	ruby-modules(ver) = %ruby_version
+# deprecated, ruby 2.0 noarch packages are versionless and extension dependency is generated by rpm5
+%ruby_ver_requires_eq	%{nil}
+%ruby_mod_ver_requires_eq	%{nil}
 
 %php_pear_dir		/usr/share/pear
 %php_data_dir		/usr/share/php
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/55edeb4e7ac4a4f308f5aceec89d71d7e94e8412



More information about the pld-cvs-commit mailing list