aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-12-17 15:05:02 +0000
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-11-02 18:12:34 +0100
commitb1a158b29efd1a84027517b2faff5884a7db2d17 (patch)
treea734abe3c9fc5c2ee581684dc04d740e40954297
parent398a8993ee1403a463b5c282402c105f7cdbbf03 (diff)
downloadperl-URPM-b1a158b29efd1a84027517b2faff5884a7db2d17.tar
perl-URPM-b1a158b29efd1a84027517b2faff5884a7db2d17.tar.gz
perl-URPM-b1a158b29efd1a84027517b2faff5884a7db2d17.tar.bz2
perl-URPM-b1a158b29efd1a84027517b2faff5884a7db2d17.tar.xz
perl-URPM-b1a158b29efd1a84027517b2faff5884a7db2d17.zip
RPMFILE_EXCLUDE & RPMFILE_UNPATCHED were drop from external API in rpm-4.11
RPMFILE_UNPATCHED is no more used and RPMFILE_EXCLUDE only exists during spec parse (see rpm commit 8d277bbb) Conflicts: NEWS URPM.xs
-rw-r--r--NEWS2
-rw-r--r--URPM.xs3
2 files changed, 2 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index ba5e222..9fe8f70 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- fix compiling with rpm-4.11
+
Version 3.50 - 14 September 2014
- make it compatible with rpm-4.12.0
diff --git a/URPM.xs b/URPM.xs
index bd2b792..cfa5376 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -519,9 +519,7 @@ return_list_tag_modifier(Header header, int32_t tag_name) {
if (list[i] & RPMFILE_NOREPLACE) *s++ = 'n';
if (list[i] & RPMFILE_SPECFILE) *s++ = 'S';
if (list[i] & RPMFILE_README) *s++ = 'R';
- if (list[i] & RPMFILE_EXCLUDE) *s++ = 'e';
if (list[i] & RPMFILE_ICON) *s++ = 'i';
- if (list[i] & RPMFILE_UNPATCHED) *s++ = 'u';
if (list[i] & RPMFILE_PUBKEY) *s++ = 'p';
break;
default:
@@ -1150,7 +1148,6 @@ static void drop_tags(Header *h) {
headerDel(*h, RPMTAG_ICON);
headerDel(*h, RPMTAG_GIF);
- headerDel(*h, RPMTAG_EXCLUDE);
headerDel(*h, RPMTAG_EXCLUSIVE);
headerDel(*h, RPMTAG_COOKIE);
headerDel(*h, RPMTAG_VERIFYSCRIPT);