From e2720b3147e2be8b5b9627e09de01136df1ab586 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 25 Oct 2023 13:41:08 +0200 Subject: Adapt for rpm-4.19.0 final --- RPM4/NEWS | 2 ++ RPM4/src/Makefile.PL | 1 + RPM4/src/RPM4.xs | 12 ++++++++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/RPM4/NEWS b/RPM4/NEWS index beff697..22134e8 100644 --- a/RPM4/NEWS +++ b/RPM4/NEWS @@ -1,3 +1,5 @@ +- Adapt for rpm-4.19.0 final + Version 0.46 - 29 April 2022 - Adapt for rpm-4.19 diff --git a/RPM4/src/Makefile.PL b/RPM4/src/Makefile.PL index c39ef23..82afac2 100644 --- a/RPM4/src/Makefile.PL +++ b/RPM4/src/Makefile.PL @@ -43,6 +43,7 @@ foreach (qw( 4.12.90 4.15.0 4.18.0 + 4.19.0 )) { my $v = $_; my $vobj = version->declare("v$_"); diff --git a/RPM4/src/RPM4.xs b/RPM4/src/RPM4.xs index 0ba8b52..b5a9f02 100644 --- a/RPM4/src/RPM4.xs +++ b/RPM4/src/RPM4.xs @@ -2219,6 +2219,7 @@ Dep_evr(Dep) CHECK_RPMDS_IX(Dep); mXPUSHs(newSVpv(rpmdsEVR(Dep), 0)); +#ifndef RPM4_19_0 int Dep_nopromote(Dep, sv_nopromote = NULL) rpmds Dep @@ -2231,7 +2232,8 @@ Dep_nopromote(Dep, sv_nopromote = NULL) } OUTPUT: RETVAL - + +#endif int Dep_add(Dep, name, sv_sense = NULL, sv_evr = NULL) @@ -2349,6 +2351,7 @@ Files_init(Files) #endif rpmfiInit(Files, 0); +#ifndef RPM4_19_0 void Files_initdir(Files) rpmfi Files @@ -2358,6 +2361,8 @@ Files_initdir(Files) #endif rpmfiInitD(Files, 0); +#endif + int Files_next(Files) rpmfi Files @@ -2376,7 +2381,8 @@ Files_hasnext(Files) RETVAL = rpmfiNext(Files) > -1; OUTPUT: RETVAL - + +#ifndef RPM4_19_0 int Files_nextdir(Files) rpmfi Files @@ -2388,6 +2394,8 @@ Files_nextdir(Files) OUTPUT: RETVAL +#endif + void Files_filename(Files) rpmfi Files -- cgit v1.2.1