use RPMTAG_SIGMD5 instead of RPMTAG_PKGID, RPMTAG_SHA1HEADER instead of RPMTAG_HDRID

3 files changed, 7 insertions, 58 deletions

diff --git a/rpminfo.c b/rpminfo.c
index 0d17abf..a32a45a 100644
--- a/rpminfo.c
+++ b/rpminfo.c
@@ -403,22 +403,18 @@ PHP_FUNCTION(rpmdbsearch)
 		tid = atol(name);
 		name = (char *)&tid;
 		len = sizeof(tid);
-#ifdef RPMTAG_PKGID
-	} else if (crit == RPMTAG_PKGID) {
+	} else if (crit == RPMTAG_SIGMD5) {
 		if (len != 32) {
-			zend_argument_value_error(1, "Bad length for PKGID, 32 expected");
+			zend_argument_value_error(1, "Bad length for PKGID/SIGMD5, 32 expected");
 			RETURN_THROWS();
 		}
 		len = hex2bin(name, MD5, len);
 		name = MD5;
-#endif
-#ifdef RPMTAG_HDRID
-	} else if (crit == RPMTAG_HDRID) {
+	} else if (crit == RPMTAG_SHA1HEADER) {
 		if (len != 40) {
-			zend_argument_value_error(1, "Bad length for HDRID, 40 expected");
+			zend_argument_value_error(1, "Bad length for HDRID/SHA1HEADER, 40 expected");
 			RETURN_THROWS();
 		}
-#endif
 	} else if (crit == RPMTAG_INSTFILENAMES) {
 		/* use input parameters */
 	} else {
diff --git a/tests/008-rpmdbsearch.phpt b/tests/008-rpmdbsearch.phpt
index bd927ec..6e0e402 100644
--- a/tests/008-rpmdbsearch.phpt
+++ b/tests/008-rpmdbsearch.phpt
@@ -3,7 +3,6 @@ Check for rpmdbinfo function
 --SKIPIF--
 <?php
 if (!extension_loaded("rpminfo")) print "skip";
-if (version_compare(RPMVERSION, '5', '>=')) die("skip for RPM 4.x");
 ?>
 
 --FILE--
@@ -24,16 +23,16 @@ $phprpm = $a[0]['Name'];
 $p = rpmdbinfo($phprpm, 1);
 
 echo "Pkgid\n";
-$a = rpmdbsearch($p[0]['Sigmd5'], RPMTAG_PKGID);
+$a = rpmdbsearch($p[0]['Sigmd5'], RPMTAG_SIGMD5);
 var_dump($a[0]['Name'] == $phprpm);
 
 echo "Hdrid\n";
-$a = rpmdbsearch($p[0]['Sha1header'], RPMTAG_HDRID);
+$a = rpmdbsearch($p[0]['Sha1header'], RPMTAG_SHA1HEADER);
 var_dump($a[0]['Name'] == $phprpm);
 var_dump(count($a[0]) < 10);
 
 echo "Hdrid (full)\n";
-$a = rpmdbsearch($p[0]['Sha1header'], RPMTAG_HDRID, -1, true);
+$a = rpmdbsearch($p[0]['Sha1header'], RPMTAG_SHA1HEADER, -1, true);
 var_dump($a[0]['Name'] == $phprpm);
 var_dump($a[0]['Sha1header'] == $p[0]['Sha1header']);
 var_dump(count($a[0]) > 20);
diff --git a/tests/016-rpmdbsearch2.phpt b/tests/016-rpmdbsearch2.phpt
deleted file mode 100644
index 350807f..0000000
--- a/tests/016-rpmdbsearch2.phpt
+++ /dev/null
@@ -1,46 +0,0 @@
---TEST--
-Check for rpmdbinfo function
---SKIPIF--
-<?php
-if (!extension_loaded("rpminfo")) print "skip";
-if (version_compare(RPMVERSION, '5', '<')) die("skip for RPM 6.x");
-?>
---FILE--
-<?php 
-echo "Name / glob\n";
-$a = rpmdbsearch('php*', RPMTAG_NAME , RPMMIRE_GLOB);
-var_dump(count($a) > 1);
-
-echo "Name / regex\n";
-$a = rpmdbsearch('^php', RPMTAG_NAME, RPMMIRE_REGEX);
-var_dump(count($a) > 1);
-
-echo "Installed file\n";
-$a = rpmdbsearch(PHP_BINARY, RPMTAG_INSTFILENAMES);
-var_dump(count($a) == 1);
-
-$phprpm = $a[0]['Name'];
-$p = rpmdbinfo($phprpm, 1);
-
-echo "Installtid\n";
-$a = rpmdbsearch($p[0]['Installtid'], RPMTAG_INSTALLTID);
-var_dump(count($a) >= 1);
-
-echo "Version\n";
-$a = rpmdbsearch($p[0]['Version'], RPMTAG_VERSION);
-var_dump(count($a) > 1);
-
-?>
-Done
---EXPECTF--
-Name / glob
-bool(true)
-Name / regex
-bool(true)
-Installed file
-bool(true)
-Installtid
-bool(true)
-Version
-bool(true)
-Done