move ruby rpmfc changes to ruby patch

refs b10643ac91ae601333286a815fcb3586aa66c24b

this patching patches is getting super annoying!

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 59b840976fb563e63df7c5206b400ec9496333d1..ae983230626e66c2f3b59e3fbb1688437055c305 100644 (file)
--- 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 4165211f561fa8a3a0e2e7fa01adc458e5265505..a2ffddc4b1196aaaccbf1a63362e251c443ffbf7 100644 (file)
--- 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);
-+                  }
 +              }
 +          }
        }