[packages/rpm] process .gemspec from current %ruby_gemdir (/usr/share/gems)

glen glen at pld-linux.org
Mon Dec 8 19:52:57 CET 2014


commit 8ea8ded4494d6e8b157adebec00fe776ee3f2a85
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Dec 8 20:52:20 2014 +0200

    process .gemspec from current %ruby_gemdir (/usr/share/gems)

 rpm-5.4.7-fix-generation-of-ruby-abi-provides.patch | 2 +-
 rpm.spec                                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 530644d..9d64e41 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -51,7 +51,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	5.4.15
-Release:	4
+Release:	5
 License:	LGPL v2.1
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm
diff --git a/rpm-5.4.7-fix-generation-of-ruby-abi-provides.patch b/rpm-5.4.7-fix-generation-of-ruby-abi-provides.patch
index 177f143..da95f37 100644
--- a/rpm-5.4.7-fix-generation-of-ruby-abi-provides.patch
+++ b/rpm-5.4.7-fix-generation-of-ruby-abi-provides.patch
@@ -21,7 +21,7 @@
  		fn += sizeof("/usr/share")-1;
  		if (!strncmp(fn, "/python", sizeof("/python")-1))
  		    fc->fcolor->vals[fc->ix] |= RPMFC_PYTHON;
-+		else if (!strncmp(fn, "/ruby", sizeof("/ruby")-1)) {
++		else if (!strncmp(fn, "/ruby", sizeof("/ruby")-1) || !strncmp(fn, "/gems/specifications", sizeof("/gems/specifications")-1)) {
 +		    fc->fcolor->vals[fc->ix] |= RPMFC_RUBY;
 +		    if ((strstr(fn, ".gemspec") || strstr(fn, "rbconfig.rb"))) {
 +			miRE mire = mireNew(RPMMIRE_REGEX, RPMTAG_FILEPATHS);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/8ea8ded4494d6e8b157adebec00fe776ee3f2a85



More information about the pld-cvs-commit mailing list