fixed bits missing during update to rpm5

diff --git a/rpm-helperEVR-noassert.patch b/rpm-helperEVR-noassert.patch
index fff4a84cfa1ae8951f48a179537bd4980bdf943c..17a51461593af5c841115bea11bfca1fd9fcbfd6 100644 (file)
--- a/rpm-helperEVR-noassert.patch
+++ b/rpm-helperEVR-noassert.patch
@@ -6,7 +6,7 @@
                EVR = pav[i];
 -assert(EVR != NULL);
 +              if(EVR == NULL) {
-+                      rpmMessage(RPMMESS_ERROR, _("%s helper returned empty version info for %s, omitting\n"), nsdep, N);
++                      rpmlog(RPMLOG_ERR, _("%s helper returned empty version info for %s, omitting\n"), nsdep, N);
 +                      continue;
 +              }
            }

diff --git a/rpm-libmagic-locale.patch b/rpm-libmagic-locale.patch
index f0184271d4c92bc7c659e87c985c7ac71cca368d..d83f577d6c3554236d9ae4c5dfbecbd1bd43221f 100644 (file)
--- a/rpm-libmagic-locale.patch
+++ b/rpm-libmagic-locale.patch
@@ -1,9 +1,10 @@
 --- rpm-4.5/rpmio/rpmmg.c.org  2012-02-29 16:32:05.655058968 +0100
 +++ rpm-4.5/rpmio/rpmmg.c      2012-02-29 16:36:22.430972834 +0100
-@@ -1114,7 +1114,28 @@
+@@ -118,7 +118,29 @@
            /*@fallthrough@*/
        case URL_IS_UNKNOWN:
        default:
++          {
 +              char *old_ctype = setlocale(LC_CTYPE, NULL);
 +              char *old_collate = setlocale(LC_COLLATE, NULL);
 +
@@ -29,3 +30,11 @@
            /* XXX HACK: libmagic compiled without <pcreposix.h> spews here. */
            if (t == NULL) {
                const char * msg = magic_error(mg->ms);
+@@ -147,6 +176,7 @@
+                   rpmlog(RPMLOG_ERR, _("magic_file(ms, %s) failed: %s\n"),
+                           (fn ? fn : "(nil)"), msg);
+           }
++          }
+           break;
+       }
+     }

diff --git a/rpm-postun-nofail.patch b/rpm-postun-nofail.patch
index e02ab7cd9689217a513ad4e086ae91d34645af6c..2c9b8c0737daaa2a9976c309c120d6185b7eb9ef 100644 (file)
--- a/rpm-postun-nofail.patch
+++ b/rpm-postun-nofail.patch
@@ -7,7 +7,7 @@
 -              rc = (rpmRC) rpmpsmNext(psm, PSM_SCRIPT);
 -              if (rc) break;
 +              if (rpmpsmNext(psm, PSM_SCRIPT))
-+                  rpmMessage(RPMMESS_VERBOSE, _("Ignoring failed %%postun scriptlet\n"));
++                  rpmlog(RPMLOG_INFO, _("Ignoring failed %%postun scriptlet\n"));
            }
  
            if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOTRIGGERPOSTUN)) {

diff --git a/rpm-unglobal.patch b/rpm-unglobal.patch
index 7dbbcb513780af8b2ca9ba3102816686884c9890..2e0d9ddbc3ae5749437d3dcc5602c5931407cfed 100644 (file)
--- a/rpm-unglobal.patch
+++ b/rpm-unglobal.patch
@@ -29,7 +29,7 @@
 +
 +    /* Names must start with alphabetic or _ and be at least 3 chars */
 +    if (!((c = *n) && (xisalpha(c) || c == '_') && (ne - n) > 2)) {
-+      rpmError(RPMERR_BADSPEC,
++      rpmlog(RPMLOG_ERR,
 +              _("Macro %%%s has illegal name (%%unglobal)\n"), n);
 +      return se;
 +    }