[packages/rpm] move ruby rpmfc changes to ruby patch

[glen]

commit 1e847c3cc66e2f1380555d101958aab0684453b6
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Dec 8 16:49:15 2014 +0200

    move ruby rpmfc changes to ruby patch
    
    refs b10643ac91ae601333286a815fcb3586aa66c24b
    
    this patching patches is getting super annoying!

 rpm-5.4.7-fix-generation-of-ruby-abi-provides.patch | 19 +++++++++++++++++++
 rpm-python-sitescriptdir.patch                      | 11 +----------
 2 files changed, 20 insertions(+), 10 deletions(-)
---
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 59b8409..ae98323 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
@@ -1,3 +1,22 @@
+--- rpm-5.4.15/lib/rpmfc.c~	2014-12-08 16:25:43.000000000 +0200
++++ rpm-5.4.15/lib/rpmfc.c	2014-12-08 16:41:11.900465719 +0200
+@@ -1181,6 +1181,15 @@
+ 		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)) {
++		    fc->fcolor->vals[fc->ix] |= RPMFC_RUBY;
++		    if ((strstr(fn, ".gemspec") || strstr(fn, "rbconfig.rb"))) {
++			miRE mire = mireNew(RPMMIRE_REGEX, RPMTAG_FILEPATHS);
++			if (!mireRegcomp(mire, ".*/(specifications/.*\\.gemspec|rbconfig\\.rb)$"))
++			    if (mireRegexec(mire, fc->fn[fc->ix], (size_t) 0) >= 0)
++				fc->fcolor->vals[fc->ix] |= RPMFC_MODULE;
++			mire = mireFree(mire);
++		    }
+ 		}
+ 	    }
+ 	}
+
 --- rpm-5.4.7/lib/rpmfc.c.rubyabi_prov~	2012-03-10 21:50:02.143073469 +0100
 +++ rpm-5.4.7/lib/rpmfc.c	2012-03-10 21:57:13.898394232 +0100
 @@ -1204,9 +1204,13 @@ assert(fc->fn != NULL);
diff --git a/rpm-python-sitescriptdir.patch b/rpm-python-sitescriptdir.patch
index 4165211..a2ffddc 100644
--- a/rpm-python-sitescriptdir.patch
+++ b/rpm-python-sitescriptdir.patch
@@ -9,7 +9,7 @@
  	/* XXX HACK: classification by path is intrinsically stupid. */
  	{   fn = strstr(fc->fn[fc->ix], "/usr/lib");
  	    if (fn) {
-@@ -1166,6 +1166,22 @@
+@@ -1166,6 +1166,13 @@
  			fc->fcolor->vals[fc->ix] & RPMFC_LIBRARY)
  		    fc->fcolor->vals[fc->ix] |= (RPMFC_MODULE|RPMFC_SCRIPT);
  	    }
@@ -18,15 +18,6 @@
 +		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)) {
-+		    fc->fcolor->vals[fc->ix] |= RPMFC_RUBY;
-+		    if ((strstr(fn, ".gemspec") || strstr(fn, "rbconfig.rb"))) {
-+			miRE mire = mireNew(RPMMIRE_REGEX, RPMTAG_FILEPATHS);
-+			if (!mireRegcomp(mire, ".*/(specifications/.*\\.gemspec|rbconfig\\.rb)$"))
-+			    if (mireRegexec(mire, fc->fn[fc->ix], (size_t) 0) >= 0)
-+				fc->fcolor->vals[fc->ix] |= RPMFC_MODULE;
-+			mire = mireFree(mire);
-+		    }
 +		}
 +	    }
  	}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/1e847c3cc66e2f1380555d101958aab0684453b6