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

--- 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
70f8787d JR	1	--- rpm-5.4.7/lib/rpmfc.c.rubyabi_prov~ 2012-03-10 21:50:02.143073469 +0100
	2	+++ rpm-5.4.7/lib/rpmfc.c 2012-03-10 21:57:13.898394232 +0100
	3	@@ -1204,9 +1204,13 @@ assert(fc->fn != NULL);
	4	}
	5	else if (!strncmp(fn, "/ruby", sizeof("/ruby")-1)) {
	6	fc->fcolor->vals[fc->ix] \|= RPMFC_RUBY;
	7	- if ((fn = strstr(fn, "/specifications/")) &&
	8	- (fn = strrchr(fn, '.')) && !strcmp(fn, ".gemspec"))
	9	- fc->fcolor->vals[fc->ix] \|= RPMFC_MODULE;
	10	+ if ((strstr(fn, ".gemspec") \|\| strstr(fn, "rbconfig.rb"))) {
	11	+ miRE mire = mireNew(RPMMIRE_REGEX, RPMTAG_FILEPATHS);
	12	+ if (!mireRegcomp(mire, "./(specifications/.\\.gemspec\|rbconfig\\.rb)$"))
	13	+ if (mireRegexec(mire, fc->fn[fc->ix], (size_t) 0) >= 0)
	14	+ fc->fcolor->vals[fc->ix] \|= RPMFC_MODULE;
	15	+ mire = mireFree(mire);
	16	+ }
	17	}
	18	/* XXX: lacking better, more generic classifier... */
	19	else if (!strncmp(fn, "/gstreamer", sizeof("/gstreamer")-1) &&