updated rediff patches

 fast_python_deps.patch                                      | 11 +++++------
 rpm-5.4.10-fix-neon-saving-error-pages-as-target-file.patch | 11 ++++-------
 rpm-5.4.7-fix-generation-of-ruby-abi-provides.patch         | 16 ----------------

diff --git a/fast_python_deps.patch b/fast_python_deps.patch
index f22e1b0154d949fd50c2393498ebb44f3e91263c..341d77a608c25dcaccd1d655badc2a82e0a626b7 100644 (file)
--- a/fast_python_deps.patch
+++ b/fast_python_deps.patch
@@ -1,6 +1,5 @@
-diff -dur -x '*~' -x '*.orig' rpm-5.4.15.orig/lib/rpmfc.c rpm-5.4.15/lib/rpmfc.c
---- rpm-5.4.15.orig/lib/rpmfc.c        2015-11-29 09:57:16.945204643 +0100
-+++ rpm-5.4.15/lib/rpmfc.c     2015-11-29 09:59:24.804768239 +0100
+--- 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 @@
    /* XXX "a /usr/bin/python -t script text executable" */
    /* XXX "python 2.3 byte-compiled" */
@@ -52,7 +51,7 @@ diff -dur -x '*~' -x '*.orig' rpm-5.4.15.orig/lib/rpmfc.c rpm-5.4.15/lib/rpmfc.c
                else if (!strncmp(fn, "/ruby", sizeof("/ruby")-1)) {
                    fc->fcolor->vals[fc->ix] |= RPMFC_RUBY;
                    if ((strstr(fn, ".gemspec") || strstr(fn, "rbconfig.rb"))) {
-@@ -1184,8 +1206,29 @@
+@@ -1212,8 +1212,29 @@
            fn = strstr(fc->fn[fc->ix], "/usr/share");
            if (fn) {
                fn += sizeof("/usr/share")-1;
@@ -81,6 +80,6 @@ diff -dur -x '*~' -x '*.orig' rpm-5.4.15.orig/lib/rpmfc.c rpm-5.4.15/lib/rpmfc.c
 +                      fc->fcolor->vals[fc->ix] |= RPMFC_PYTHON;
 +                  }
 +              }
-               else if (!strncmp(fn, "/ruby", sizeof("/ruby")-1) || !strncmp(fn, "/gems/specifications", sizeof("/gems/specifications")-1)) {
+               else if (!strncmp(fn, "/ruby", sizeof("/ruby")-1)) {
                    fc->fcolor->vals[fc->ix] |= RPMFC_RUBY;
-                   if ((strstr(fn, ".gemspec") || strstr(fn, "rbconfig.rb"))) {
+ /* XXX specification/{*.gemspec,rpmconfig.rb} should use rpmGlob/fnmatch. */

diff --git a/rpm-5.4.10-fix-neon-saving-error-pages-as-target-file.patch b/rpm-5.4.10-fix-neon-saving-error-pages-as-target-file.patch
index 300a35097d1a80aa05c6c03e28a34ac576aa270c..0b1e338100a7c7bbecd4e0e37170fcdd84506148 100644 (file)
--- a/rpm-5.4.10-fix-neon-saving-error-pages-as-target-file.patch
+++ b/rpm-5.4.10-fix-neon-saving-error-pages-as-target-file.patch
@@ -1,5 +1,5 @@
---- rpm-5.4.10/rpmio/rpmdav.c.dl_error~        2012-07-06 17:39:19.000000000 +0200
-+++ rpm-5.4.10/rpmio/rpmdav.c  2012-07-11 19:49:00.504968365 +0200
+--- rpm-5.4.16/rpmio/rpmdav.c~ 2016-03-16 18:36:34.000000000 +0200
++++ rpm-5.4.16/rpmio/rpmdav.c  2016-03-16 18:40:59.883064408 +0200
 @@ -1722,6 +1722,7 @@ int davReq(FD_t ctrl, const char * httpC
  {
      urlinfo u;
@@ -8,18 +8,15 @@
  
  assert(ctrl != NULL);
      u = (urlinfo) ctrl->u;
-@@ -1789,10 +1790,24 @@ assert(ctrl->req != NULL);
+@@ -2032,10 +2032,21 @@
      }
  
  /* XXX somewhere else instead? */
--if (_dav_debug) {
+-if (_dav_debug) {             /* HACK: tools/wget.c */
 -    const ne_status *status = ne_get_status((ne_request *)ctrl->req);
 -fprintf(stderr, "HTTP request sent, awaiting response... %d %s\n", status->code, status->reason_phrase);
 -}
 +    status = ne_get_status((ne_request *)ctrl->req);
-+    if (_dav_debug)
-+      fprintf(stderr, "HTTP request sent, awaiting response... %d %s\n", status->code, status->reason_phrase);
-+
 +    switch (status->code) {
 +      case 200:
 +      case 201:                       /* 201 Created. */

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 da95f37c17209da11de3e1fc7121bdc87d661b29..8c9437c0ffbe1501485d0ec84ca2b5be17ebd8a7 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
@@ -17,19 +17,3 @@
                }
                /* 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) || !strncmp(fn, "/gems/specifications", sizeof("/gems/specifications")-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);
-+                  }
-               }
-           }
-       }

diff --git a/rpm.spec b/rpm.spec
index ef0e9f68bce3236a22650b52b5ccebf5bdc1fc75..384731892334056a42031cf86085e1bf14ea27a9 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -985,7 +985,7 @@ cd -
 %patch1021 -p1
 %patch1022 -p1
 %patch1024 -p1
-#%patch1027 -p1 REDIFF
+%patch1027 -p1
 %patch1028 -p1
 %patch1029 -p1
 %patch1030 -p1
@@ -994,7 +994,7 @@ cd -
 %patch1033 -p1
 
 %patch1035 -p1
-#%patch1037 -p1 REDIFF
+%patch1037 -p1
 %patch1038 -p1
 %patch1039 -p1
 %patch1040 -p1
@@ -1009,7 +1009,7 @@ cd -
 %patch1049 -p1
 
 %patch83 -p1
-#%patch92 -p1 REDIFF after other rpmfc patches
+%patch92 -p1
 %patch93 -p1
 %patch94 -p1