From 00fa59a1c337d41194f50966cbb939a63811d157 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 1 Nov 2017 01:33:06 +0100 Subject: restore rpm-4.12.x compatibility --- NEWS | 2 ++ URPM.xs | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/NEWS b/NEWS index 0895e66..9634150 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ - make clear URPM needs rpm >= 4.14 +- restore compatibility with rpm-4.12.x & 4.13.x - revert fix for segfault with rpm-4.14 when checking invalid signatures as rpm got fixed +- restore rpm-4.12.x compatibility - restore rpm-4.13.x compatibility - use ExtUtils::PkgConfig in order to get rpm installed - cpan testers: diff --git a/URPM.xs b/URPM.xs index ef3254b..65729a5 100644 --- a/URPM.xs +++ b/URPM.xs @@ -1269,10 +1269,12 @@ static void *rpmRunTransactions_callback(__attribute__((unused)) const void *h, callback = td->callback_error; callback_type = "error"; break; +#ifdef RPM4_13_0 case RPMCALLBACK_ELEM_PROGRESS: callback = td->callback_elem; callback_type = "elem"; break; +#endif default: break; } @@ -1304,9 +1306,11 @@ static void *rpmRunTransactions_callback(__attribute__((unused)) const void *h, case RPMCALLBACK_CPIO_ERROR: callback_subtype = "cpio"; break; +#ifdef RPM4_13_0 case RPMCALLBACK_ELEM_PROGRESS: callback_subtype = "progress"; break; +#endif case RPMCALLBACK_SCRIPT_ERROR: callback_subtype = "script"; break; -- cgit v1.2.1