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-04 07:42:18 +0100
commit85af17a035765ddf28d053a20cfdd3ef71b26901 (patch)
treeb5de1c04c7809e6dcef09ffb3c86963720b9d4c3
parent265f64c67ef5e86757828fc8cee1b8c908b8c0b7 (diff)
downloadperl-URPM-85af17a035765ddf28d053a20cfdd3ef71b26901.tar
perl-URPM-85af17a035765ddf28d053a20cfdd3ef71b26901.tar.gz
perl-URPM-85af17a035765ddf28d053a20cfdd3ef71b26901.tar.bz2
perl-URPM-85af17a035765ddf28d053a20cfdd3ef71b26901.tar.xz
perl-URPM-85af17a035765ddf28d053a20cfdd3ef71b26901.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 e0720cd..cea8523 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 5fade80..0bd209d 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:
@@ -1151,7 +1149,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);