[packages/rpm.git] / rpm-5.4.7-fix-generation-of-ruby-abi-provides.patch

--- 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);
 		}
 		else if (!strncmp(fn, "/ruby", sizeof("/ruby")-1)) {
 		    fc->fcolor->vals[fc->ix] |= RPMFC_RUBY;
-		    if ((fn = strstr(fn, "/specifications/")) &&
-			(fn = strrchr(fn, '.')) && !strcmp(fn, ".gemspec"))
-			fc->fcolor->vals[fc->ix] |= RPMFC_MODULE;
+		    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);
+		    }
 		}
 		/* XXX: lacking better, more generic classifier... */
 		else if (!strncmp(fn, "/gstreamer", sizeof("/gstreamer")-1) &&
Commit	Line	Data
1e847c3c ER	1	--- rpm-5.4.15/lib/rpmfc.c~ 2014-12-08 16:25:43.000000000 +0200
	2	+++ rpm-5.4.15/lib/rpmfc.c 2014-12-08 16:41:11.900465719 +0200
	3	@@ -1181,6 +1181,15 @@
	4	fn += sizeof("/usr/share")-1;
	5	if (!strncmp(fn, "/python", sizeof("/python")-1))
	6	fc->fcolor->vals[fc->ix] \|= RPMFC_PYTHON;
	7	+ else if (!strncmp(fn, "/ruby", sizeof("/ruby")-1)) {
	8	+ fc->fcolor->vals[fc->ix] \|= RPMFC_RUBY;
	9	+ if ((strstr(fn, ".gemspec") \|\| strstr(fn, "rbconfig.rb"))) {
	10	+ miRE mire = mireNew(RPMMIRE_REGEX, RPMTAG_FILEPATHS);
	11	+ if (!mireRegcomp(mire, "./(specifications/.\\.gemspec\|rbconfig\\.rb)$"))
	12	+ if (mireRegexec(mire, fc->fn[fc->ix], (size_t) 0) >= 0)
	13	+ fc->fcolor->vals[fc->ix] \|= RPMFC_MODULE;
	14	+ mire = mireFree(mire);
	15	+ }
	16	}
	17	}
	18	}
	19
70f8787d JR	20	--- rpm-5.4.7/lib/rpmfc.c.rubyabi_prov~ 2012-03-10 21:50:02.143073469 +0100
	21	+++ rpm-5.4.7/lib/rpmfc.c 2012-03-10 21:57:13.898394232 +0100
	22	@@ -1204,9 +1204,13 @@ assert(fc->fn != NULL);
	23	}
	24	else if (!strncmp(fn, "/ruby", sizeof("/ruby")-1)) {
	25	fc->fcolor->vals[fc->ix] \|= RPMFC_RUBY;
	26	- if ((fn = strstr(fn, "/specifications/")) &&
	27	- (fn = strrchr(fn, '.')) && !strcmp(fn, ".gemspec"))
	28	- fc->fcolor->vals[fc->ix] \|= RPMFC_MODULE;
	29	+ if ((strstr(fn, ".gemspec") \|\| strstr(fn, "rbconfig.rb"))) {
	30	+ miRE mire = mireNew(RPMMIRE_REGEX, RPMTAG_FILEPATHS);
	31	+ if (!mireRegcomp(mire, "./(specifications/.\\.gemspec\|rbconfig\\.rb)$"))
	32	+ if (mireRegexec(mire, fc->fn[fc->ix], (size_t) 0) >= 0)
	33	+ fc->fcolor->vals[fc->ix] \|= RPMFC_MODULE;
	34	+ mire = mireFree(mire);
	35	+ }
	36	}
	37	/* XXX: lacking better, more generic classifier... */
	38	else if (!strncmp(fn, "/gstreamer", sizeof("/gstreamer")-1) &&