summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2019-09-09 16:05:07 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2019-09-09 16:17:39 +0200
commit9e3deaefdbc54910d58dea28d06c2678673c9d09 (patch)
treee66a659816b918ad74e95736c090f0f33c031e6f
parentc8d1420ca5aa2276080970315b23bbdce5b78272 (diff)
downloadperl-RPM4-9e3deaefdbc54910d58dea28d06c2678673c9d09.tar
perl-RPM4-9e3deaefdbc54910d58dea28d06c2678673c9d09.tar.gz
perl-RPM4-9e3deaefdbc54910d58dea28d06c2678673c9d09.tar.bz2
perl-RPM4-9e3deaefdbc54910d58dea28d06c2678673c9d09.tar.xz
perl-RPM4-9e3deaefdbc54910d58dea28d06c2678673c9d09.zip
fix building with rpm-4.15
-rw-r--r--RPM4/NEWS2
-rw-r--r--RPM4/src/RPM4.xs6
-rw-r--r--rpmconstant/NEWS2
-rw-r--r--rpmconstant/rpmconstant.h1
4 files changed, 10 insertions, 1 deletions
diff --git a/RPM4/NEWS b/RPM4/NEWS
index c5d556b..84f0433 100644
--- a/RPM4/NEWS
+++ b/RPM4/NEWS
@@ -1,3 +1,5 @@
+- fix building with rpm-4.15
+
Version 0.39 - 18 September 2018
- cpan testers: skip some tests on *BSD & Debian
diff --git a/RPM4/src/RPM4.xs b/RPM4/src/RPM4.xs
index cd8fa56..3f54b29 100644
--- a/RPM4/src/RPM4.xs
+++ b/RPM4/src/RPM4.xs
@@ -426,7 +426,13 @@ int _specbuild(rpmSpec spec, SV * sv_buildflags) {
if (buildflags == RPMBUILD_NONE) croak("No action given for build");
BTA_t flags = calloc(1, sizeof(*flags));
flags->buildAmount = buildflags;
+#if defined(RPM4_15_0)
+ rpmts ts = rpmtsCreate();
+ return rpmSpecBuild(ts, spec, flags);
+ (void)rpmtsFree(ts);
+#else
return rpmSpecBuild(spec, flags);
+#endif
}
void _installsrpms(rpmts ts, char * filename) {
diff --git a/rpmconstant/NEWS b/rpmconstant/NEWS
index 33df14b..d99ca87 100644
--- a/rpmconstant/NEWS
+++ b/rpmconstant/NEWS
@@ -1,3 +1,5 @@
+- fix building with rpm-4.15
+
Version 0.1.4 - 17 December 2012
- add support for rpm-4.8 - 4.11
diff --git a/rpmconstant/rpmconstant.h b/rpmconstant/rpmconstant.h
index 5c01946..6be9db1 100644
--- a/rpmconstant/rpmconstant.h
+++ b/rpmconstant/rpmconstant.h
@@ -36,7 +36,6 @@
#include <rpm/rpmtag.h>
#include <rpm/rpmte.h>
#include <rpm/rpmts.h>
-#include <rpm/rpmvf.h>
/**
* A constant pair name/value