merge patches from package repository: fix build with rpm-4.9+

2 files changed, 4 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index a61bccc..127a10c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- merge patches from package repository:
+  o fix build with rpm-4.9+
+
 Version 1.148 - 25 Jul 2012, by Thierry Vignaud
 - drop automatically generated dependencies on interpreters we either don't
   need dependencies on or that we have other dedicated dependency generators
diff --git a/rpmeval.c b/rpmeval.c
index c6b1469..a325053 100644
--- a/rpmeval.c
+++ b/rpmeval.c
@@ -22,11 +22,7 @@ int main(int argc, char **argv)
         fprintf(stderr, "Cannot load configuration\n");
         return rc;
     }
-    if (rc = rpmLoadMacroFile(rpmGlobalMacroContext, argv[1]
-#ifndef RPMDBI_LABEL
-	    ,2
-#endif
-	    )) {
+    if (rc = rpmLoadMacroFile(rpmGlobalMacroContext, argv[1]))) {
         fprintf(stderr, "Cannot read %s\n", argv[1]);
         return rc;
     }