commit 260ad381006cb10d61c25b9f9712333e400111cf
Author: Elan Ruusamäe <[email protected]>
Date: Mon Dec 8 16:53:14 2014 +0200
rediff
...5.4.7-fix-generation-of-ruby-abi-provides.patch | 39 ++++++++++------------
1 file changed, 18 insertions(+), 21 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 ae98323..177f143 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,11 +1,12 @@
---- 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))
+--- rpm-5.4.15/lib/rpmfc.c 2014-12-08 16:52:23.628067323 +0200
++++ rpm-5.4.15.orig/lib/rpmfc.c 2014-12-08 16:23:46.377110108 +0200
+@@ -1155,9 +1155,13 @@
fc->fcolor->vals[fc->ix] |= RPMFC_PYTHON;
-+ else if (!strncmp(fn, "/ruby", sizeof("/ruby")-1)) {
-+ fc->fcolor->vals[fc->ix] |= RPMFC_RUBY;
+ 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)$"))
@@ -14,18 +15,14 @@
+ 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;
+ /* XXX: lacking better, more generic classifier... */
+ else if (!strncmp(fn, "/gstreamer", sizeof("/gstreamer")-1) &&
+@@ -1177,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)$"))
@@ -34,5 +31,5 @@
+ mire = mireFree(mire);
+ }
}
- /* XXX: lacking better, more generic classifier... */
- else if (!strncmp(fn, "/gstreamer", sizeof("/gstreamer")-1) &&
+ }
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/260ad381006cb10d61c25b9f9712333e400111cf
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
