diff options
| -rw-r--r-- | RPM4/NEWS | 6 | ||||
| -rw-r--r-- | RPM4/lib/RPM4.pm | 2 | ||||
| -rw-r--r-- | RPM4/src/Makefile.PL | 1 | ||||
| -rw-r--r-- | RPM4/src/RPM4.xs | 12 | ||||
| -rw-r--r-- | RPM4/t/01compile.t | 1 |
5 files changed, 19 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Version 0.47 - 25 October 2023 + +- Adapt for rpm-4.19.0 final + +Version 0.46 - 29 April 2022 + - Adapt for rpm-4.19 - Fix Te->file segfaulting (at least with rpm-4.18+) diff --git a/RPM4/lib/RPM4.pm b/RPM4/lib/RPM4.pm index 3d4ec91..360d05e 100644 --- a/RPM4/lib/RPM4.pm +++ b/RPM4/lib/RPM4.pm @@ -30,7 +30,7 @@ use RPM4::Header::Dependencies; use RPM4::Header::Files; use RPM4::Spec; -our $VERSION = '0.45'; +our $VERSION = '0.47'; our @ISA = qw(DynaLoader Exporter); our @EXPORT = qw(moduleinfo readconfig querytag tagName tagValue expand rpmvercmp 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 diff --git a/RPM4/t/01compile.t b/RPM4/t/01compile.t index 544188e..bb91232 100644 --- a/RPM4/t/01compile.t +++ b/RPM4/t/01compile.t @@ -4,6 +4,7 @@ use Test::More tests => 3; use_ok('RPM4'); +warn ">> RPM version: ", `rpm --version`, "\n"; can_ok('RPM4', qw(rpm2header stream2header dumprc dumpmacros newdb)); #Header |