summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--RPM4/NEWS1
-rwxr-xr-xrpmconstant/rpmh2tbl12
2 files changed, 9 insertions, 4 deletions
diff --git a/RPM4/NEWS b/RPM4/NEWS
index 857de40..f57568c 100644
--- a/RPM4/NEWS
+++ b/RPM4/NEWS
@@ -1,4 +1,5 @@
- drop support for repackage (not working anymore since rpm-4.6)
+- fix parsing new rpm headers
- fix retrieving rpm version with beta versions
- fix srcrpm()
- fix --rpmversion (broken for 6+ years...)
diff --git a/rpmconstant/rpmh2tbl b/rpmconstant/rpmh2tbl
index 92aeabe..8efa9aa 100755
--- a/rpmconstant/rpmh2tbl
+++ b/rpmconstant/rpmh2tbl
@@ -34,8 +34,6 @@ my @availlabletables;
my %file_const = (
'rpmlib.h' => {
'^(RPMDBI_[\w_]+)' => 'rpmdbi',
- '^_?(RPMSENSE_[\w_]+)' => 'rpmsenseflags',
- '^(RPMTAG_[\w_]+)' => 'rpmTag',
'^(RPMRC_[\w_]+)' => 'rpmRC',
'^(RPMFILE_[^(STATE_)][\w_]+)' => 'rpmfileAttrs',
'^(RPMFILE_STATE_[\w_]+)' => 'rpmfileState',
@@ -43,14 +41,12 @@ my %file_const = (
'^(RPMPROB_FILTER_[\w_]+)' => 'rpmprobFilterFlags',
'^(FA_[\w_]+)' => 'fileAction',
'^(PIPE|CDEV|XDIR|BDEV|REG|LINK|SOCK)$' => 'fileTypes',
- '^(RPMTRANS_FLAG_[\w_]+)' => 'rpmtransFlags',
'^(INSTALL_[\w_]+)' => 'rpmInstallInterfaceFlags',
'^(UNINSTALL_[\w_]+)' => 'rpmEraseInterfaceFlags',
'^(RPMSIGTAG_[\w_]+)' => 'rpmtagSignature',
},
'header.h' => {
'^(HEADER_MAGIC_[\w_]+)' => 'hMagic',
- '^(RPM_[\w]+)_TYPE$' => 'rpmTagType',
},
'rpmbuild.h' => {
'^(RPMBUILD_[\w_]+)' => 'rpmBuildFlags',
@@ -63,6 +59,9 @@ my %file_const = (
'rpmdb.h' => {
'^(RPMMIRE_[\w_]+)' => 'rpmMireMode',
},
+ 'rpmds.h' => {
+ '^_?(RPMSENSE_[\w_]+)' => 'rpmsenseflags',
+ },
'rpmerr.h' => {
'^(RPMERR_[\w_]+)' => 'rpmerrCode',
},
@@ -79,11 +78,16 @@ my %file_const = (
'rpmps.h' => {
'^(RPMPROB_[\w_]+)' => 'rpmProblemType',
},
+ 'rpmtag.h' => {
+ '^(RPMTAG_[\w_]+)' => 'rpmTag',
+ '^(RPM_[\w]+)_TYPE$' => 'rpmTagType',
+ },
'rpmte.h' => {
'^(TR_[\w_]+)' => 'rpmElementType',
},
'rpmts.h' => {
'^_?(RPMVSF_[\w_]+)' => 'rpmvsflags',
+ '^(RPMTRANS_FLAG_[\w_]+)' => 'rpmtransFlags',
'^(RPMTRANS_TYPE_[\w_]+)' => 'rpmtsType',
'^(RPMTS_OP_[\w_]+)' => 'rpmtsOpX',
},