[packages/rpm-build-tools] adapter: few ruby fixes
glen
glen at pld-linux.org
Mon Jul 21 15:23:30 CEST 2014
commit 5f2fb9154a62149349e135bbfedf6a18cd4d94c2
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Jul 21 16:23:22 2014 +0300
adapter: few ruby fixes
adapter.awk | 7 +++++++
1 file changed, 7 insertions(+)
---
diff --git a/adapter.awk b/adapter.awk
index 3df9b26..b98a38f 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -642,6 +642,11 @@ preamble == 1 {
$1 = "Requires:"
}
+ # deprecated. such deps are autogenerated in rpm5
+ if ($0 == "%{?ruby_mod_ver_requires_eq}") {
+ next
+ }
+
# F<16 had requires(hint)
if (/^Requires\(hint\):/) {
$1 = "Suggests:"
@@ -2138,6 +2143,8 @@ function replace_requires(field, pkg) {
# bad package.xml, see http://pear.php.net/bugs/bug.php?id=17779
sub(/^php-php-gtk/, "php-gtk2", $2)
+ sub(/^rake/, "ruby-rake", $2)
+
# {{{ jpackages / fedora java packages
sub(/^antlr3$/, "java-antlr3", $2)
sub(/^aqute-bnd$/, "java-bnd", $2)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/5f2fb9154a62149349e135bbfedf6a18cd4d94c2
More information about the pld-cvs-commit
mailing list