From 017e18c8d0dd45074423f0ac08191d7456bf710b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 12 Mar 2020 09:57:27 +0100
Subject: mode dependency tags and drop EXPERIMENTAL

---
 EXPERIMENTAL        | 0
 examples/librpm.php | 4 ++--
 package.xml         | 3 +--
 rpminfo.c           | 8 ++++++--
 4 files changed, 9 insertions(+), 6 deletions(-)
 delete mode 100644 EXPERIMENTAL

diff --git a/EXPERIMENTAL b/EXPERIMENTAL
deleted file mode 100644
index e69de29..0000000
diff --git a/examples/librpm.php b/examples/librpm.php
index 16fdc78..3106b8b 100644
--- a/examples/librpm.php
+++ b/examples/librpm.php
@@ -139,7 +139,7 @@ function WhatProvides($crit) {
 	if (file_exists($crit)) {
 		$a = \rpmdbsearch($crit, RPM_TAG_INSTFILENAMES);
 	} else {
-		$a = \rpmdbsearch($crit, RPM_TAG_PROVIDENAME);
+		$a = \rpmdbsearch($crit, RPM_TAG_PROVIDES);
 	}
 	$r = [];
 	if (is_array($a)) {
@@ -157,7 +157,7 @@ function WhatProvides($crit) {
  * print_r($a[0]->NEVRA);
  **/
 function WhatRequires($crit) {
-	$a = \rpmdbsearch($crit, RPM_TAG_REQUIRENAME);
+	$a = \rpmdbsearch($crit, RPM_TAG_REQUIRES);
 
 	$r = [];
 	if (is_array($a)) {
diff --git a/package.xml b/package.xml
index 2b3d729..14801b3 100644
--- a/package.xml
+++ b/package.xml
@@ -27,7 +27,7 @@ Available functions:
   <license>PHP 3.01</license>
   <notes>
 - add rpmdbsearch function to search packages using
-  name, owned files, requires, provides...
+  name, installed files, requires, provides...
   </notes>
   <contents>
     <dir name="/">
@@ -37,7 +37,6 @@ Available functions:
       <file name="rpminfo.c" role="src"/>
       <!-- documentation -->
       <file name="CREDITS" role="doc"/>
-      <file name="EXPERIMENTAL" role="doc"/>
       <file name="LICENSE" role="doc"/>
       <file name="README.md" role="doc"/>
       <dir name ="examples">
diff --git a/rpminfo.c b/rpminfo.c
index e0f970d..ffe907a 100644
--- a/rpminfo.c
+++ b/rpminfo.c
@@ -458,8 +458,12 @@ PHP_MINIT_FUNCTION(rpminfo)
 
 	REGISTER_LONG_CONSTANT("RPM_TAG_NAME",           RPMTAG_NAME,            CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("RPM_TAG_INSTFILENAMES",  RPMTAG_INSTFILENAMES,   CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RPM_TAG_REQUIRENAME",    RPMTAG_REQUIRENAME,     CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("RPM_TAG_PROVIDENAME",    RPMTAG_PROVIDENAME,     CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RPM_TAG_REQUIRES",       RPMTAG_REQUIRES,        CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RPM_TAG_PROVIDES",       RPMTAG_PROVIDES,        CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RPM_TAG_RECOMMENDS",     RPMTAG_RECOMMENDS,      CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RPM_TAG_SUGGESTS",       RPMTAG_SUGGESTS,        CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RPM_TAG_ENHANCES",       RPMTAG_ENHANCES,        CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("RPM_TAG_SUPPLEMENTS",    RPMTAG_SUPPLEMENTS,     CONST_CS | CONST_PERSISTENT);
 
 	return SUCCESS;
 }
-- 
cgit