- restore "process .gemspec from current %ruby_gemdir (/usr/share/gems)"; rel 0.11

diff --git a/fast_python_deps.patch b/fast_python_deps.patch
index 341d77a608c25dcaccd1d655badc2a82e0a626b7..051263a109527785c5d26188fed798805313d7e0 100644 (file)
--- a/fast_python_deps.patch
+++ b/fast_python_deps.patch
@@ -1,6 +1,6 @@
---- rpm-5.4.16/lib/rpmfc.c~    2016-03-16 18:42:01.000000000 +0200
-+++ rpm-5.4.16/lib/rpmfc.c     2016-03-16 18:43:00.049306865 +0200
-@@ -604,8 +604,6 @@
+--- rpm-5.4.17/lib/rpmfc.c.orig        2018-06-10 09:52:43.111996936 +0200
++++ rpm-5.4.17/lib/rpmfc.c     2018-06-10 09:54:23.968662453 +0200
+@@ -606,8 +606,6 @@
    /* XXX "a /usr/bin/python -t script text executable" */
    /* XXX "python 2.3 byte-compiled" */
    { " /usr/bin/python",               RPMFC_PYTHON|RPMFC_INCLUDE },
@@ -9,7 +9,7 @@
  
    { "libtool library ",               RPMFC_LIBTOOL|RPMFC_INCLUDE },
    { "pkgconfig ",             RPMFC_PKGCONFIG|RPMFC_INCLUDE },
-@@ -1114,6 +1112,9 @@
+@@ -1118,6 +1116,9 @@
      int i;
      int xx;
      int skipping;
@@ -19,7 +19,7 @@
  
      miRE mire;
      int skipProv = fc->skipProv;
-@@ -1156,8 +1157,29 @@
+@@ -1160,8 +1161,29 @@
                if ((fn[0] == '3' && fn[1] == '2') || 
                        (fn[0] == '6' && fn[1] == '4'))
                    fn += 2;
@@ -51,7 +51,7 @@
                else if (!strncmp(fn, "/ruby", sizeof("/ruby")-1)) {
                    fc->fcolor->vals[fc->ix] |= RPMFC_RUBY;
                    if ((strstr(fn, ".gemspec") || strstr(fn, "rbconfig.rb"))) {
-@@ -1212,8 +1212,29 @@
+@@ -1190,8 +1212,29 @@
            fn = strstr(fc->fn[fc->ix], "/usr/share");
            if (fn) {
                fn += sizeof("/usr/share")-1;
@@ -80,6 +80,6 @@
 +                      fc->fcolor->vals[fc->ix] |= RPMFC_PYTHON;
 +                  }
 +              }
-               else if (!strncmp(fn, "/ruby", sizeof("/ruby")-1)) {
+               else if (!strncmp(fn, "/ruby", sizeof("/ruby")-1) || !strncmp(fn, "/gems/specifications", sizeof("/gems/specifications")-1)) {
                    fc->fcolor->vals[fc->ix] |= RPMFC_RUBY;
  /* XXX specification/{*.gemspec,rpmconfig.rb} should use rpmGlob/fnmatch. */

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 8c9437c0ffbe1501485d0ec84ca2b5be17ebd8a7..06a73877be36d6ca7bad7f5187713b4a9032b71c 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,6 +1,6 @@
---- 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 @@
+--- rpm-5.4.17/lib/rpmfc.c.orig        2018-06-10 09:46:56.795334224 +0200
++++ rpm-5.4.17/lib/rpmfc.c     2018-06-10 09:52:10.905330637 +0200
+@@ -1164,9 +1164,13 @@
                    fc->fcolor->vals[fc->ix] |= RPMFC_PYTHON;
                else if (!strncmp(fn, "/ruby", sizeof("/ruby")-1)) {
                    fc->fcolor->vals[fc->ix] |= RPMFC_RUBY;
@@ -17,3 +17,12 @@
                }
                /* XXX: lacking better, more generic classifier... */
                else if (!strncmp(fn, "/gstreamer", sizeof("/gstreamer")-1) &&
+@@ -1188,7 +1192,7 @@
+               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)) {
++              else if (!strncmp(fn, "/ruby", sizeof("/ruby")-1) || !strncmp(fn, "/gems/specifications", sizeof("/gems/specifications")-1)) {
+                   fc->fcolor->vals[fc->ix] |= RPMFC_RUBY;
+ /* XXX specification/{*.gemspec,rpmconfig.rb} should use rpmGlob/fnmatch. */
+                   if ((strstr(fn, ".gemspec") || strstr(fn, "rbconfig.rb"))) {

diff --git a/rpm.spec b/rpm.spec
index 91014660e8f26bc7168e1f3a697bf633b38a4023..c71b48b227c947532d77c3fb5a274bad79979a67 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -58,7 +58,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.4.17
-Release:       0.10
+Release:       0.11
 License:       LGPL v2.1
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.17-0.20160512.src.rpm