aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <peroyvind@mandriva.org>2010-10-16 11:12:45 +0000
committerPer Øyvind Karlsen <peroyvind@mandriva.org>2010-10-16 11:12:45 +0000
commitc7c4ac2a2e499416eda91d854ae008bb5c16c7c8 (patch)
treed9cc012950df487a668b262fefbcdf43fe61fc1b
parent538e1d8a674d551fd9d0e76241fbb803680ed165 (diff)
downloadrpm-setup-c7c4ac2a2e499416eda91d854ae008bb5c16c7c8.tar
rpm-setup-c7c4ac2a2e499416eda91d854ae008bb5c16c7c8.tar.gz
rpm-setup-c7c4ac2a2e499416eda91d854ae008bb5c16c7c8.tar.bz2
rpm-setup-c7c4ac2a2e499416eda91d854ae008bb5c16c7c8.tar.xz
rpm-setup-c7c4ac2a2e499416eda91d854ae008bb5c16c7c8.zip
fix build with rpm 5.3 api
-rw-r--r--NEWS3
-rw-r--r--rpmeval.c6
2 files changed, 8 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 489084f..fd528d9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Version 1.109 - ?? ??????? 2010, by ???
+- fix build with rpm 5.3
+
Version 1.108 - 16 October 2010, by Per Øyvind Karlsen
- add gem_helper.rb and it's corresponding macros %gem_unpack, %gem_build &
gem_install for simplifying & streamlining ruby gem packaging.
diff --git a/rpmeval.c b/rpmeval.c
index 5daaed8..c719352 100644
--- a/rpmeval.c
+++ b/rpmeval.c
@@ -22,7 +22,11 @@ int main(int argc, char **argv)
fprintf(stderr, "Cannot load configuration\n");
return rc;
}
- if (rc = rpmLoadMacroFile(rpmGlobalMacroContext, argv[1])) {
+ if (rc = rpmLoadMacroFile(rpmGlobalMacroContext, argv[1]
+#ifndef RPMDBI_LABEL
+ ,2
+#endif
+ )) {
fprintf(stderr, "Cannot read %s\n", argv[1]);
return rc;
}