Accepting request 18841 from Base:System

Copy from Base:System/rpm based on submit request 18841 from user mlschroe

OBS-URL: https://build.opensuse.org/request/show/18841
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=84

missingok.diff

@@ -4,8 +4,8 @@ Index: lib/depends.c
 ===================================================================
 --- lib/depends.c.orig
 +++ lib/depends.c
-@@ -593,8 +593,13 @@ retry:
- /*@=boundsread@*/
+@@ -518,8 +518,13 @@ retry:
+     }
  
  unsatisfied:
 -    rc = 1;	/* dependency is unsatisfied */
@@ -20,7 +20,7 @@ Index: lib/depends.c
  
  exit:
      /*
-@@ -963,6 +968,8 @@ static inline /*@observer@*/ const char
+@@ -827,6 +832,8 @@ static inline const char * identifyDepen
  	return "Requires(postun):";
      if (f & RPMSENSE_SCRIPT_VERIFY)
  	return "Requires(verify):";
@@ -29,11 +29,11 @@ Index: lib/depends.c
      if (f & RPMSENSE_FIND_REQUIRES)
  	return "Requires(auto):";
      return "Requires:";
-Index: lib/rpmlib.h
+Index: lib/rpmds.h
 ===================================================================
---- lib/rpmlib.h.orig
-+++ lib/rpmlib.h
-@@ -548,6 +548,7 @@ typedef	enum rpmsenseFlags_e {
+--- lib/rpmds.h.orig
++++ lib/rpmds.h
+@@ -73,6 +73,7 @@ typedef	enum rpmsenseFlags_e {
      RPMSENSE_SCRIPT_POSTUN | \
      RPMSENSE_SCRIPT_VERIFY | \
      RPMSENSE_FIND_REQUIRES | \