]> git.pld-linux.org Git - packages/rpm.git/blob - rpm-5.4.7-fix-generation-of-ruby-abi-provides.patch
move ruby rpmfc changes to ruby patch
[packages/rpm.git] / rpm-5.4.7-fix-generation-of-ruby-abi-provides.patch
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
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) &&
This page took 0.033222 seconds and 4 git commands to generate.