Really allow qualifiers like pre/post/meta for weak dependencies

Commit ddbf30c neglected to update the preamble table types for the weak dependency tags, so it never worked. Add a test to ensure it works and stays that way. Test depends on 078ccae Fixes: #624
rpm-software-management · Mar 13, 2024 · 0644ba5 · 0644ba5
1 parent 9cb0589
commit 0644ba5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/build/parsePreamble.c b/build/parsePreamble.c
@@ -1100,10 +1100,10 @@ static struct PreambleRec_s const preambleList[] = {
     {RPMTAG_ICON,		0, 0, 0, 0, LEN_AND_STR("icon")},
     {RPMTAG_PROVIDENAME,	0, 0, 0, 0, LEN_AND_STR("provides")},
     {RPMTAG_REQUIRENAME,	2, 0, 0, 0, LEN_AND_STR("requires")},
-    {RPMTAG_RECOMMENDNAME,	0, 0, 0, 0, LEN_AND_STR("recommends")},
-    {RPMTAG_SUGGESTNAME,	0, 0, 0, 0, LEN_AND_STR("suggests")},
-    {RPMTAG_SUPPLEMENTNAME,	0, 0, 0, 0, LEN_AND_STR("supplements")},
-    {RPMTAG_ENHANCENAME,	0, 0, 0, 0, LEN_AND_STR("enhances")},
+    {RPMTAG_RECOMMENDNAME,	2, 0, 0, 0, LEN_AND_STR("recommends")},
+    {RPMTAG_SUGGESTNAME,	2, 0, 0, 0, LEN_AND_STR("suggests")},
+    {RPMTAG_SUPPLEMENTNAME,	2, 0, 0, 0, LEN_AND_STR("supplements")},
+    {RPMTAG_ENHANCENAME,	2, 0, 0, 0, LEN_AND_STR("enhances")},
     {RPMTAG_PREREQ,		2, 1, 0, 0, LEN_AND_STR("prereq")},
     {RPMTAG_CONFLICTNAME,	0, 0, 0, 0, LEN_AND_STR("conflicts")},
     {RPMTAG_OBSOLETENAME,	0, 0, 0, 0, LEN_AND_STR("obsoletes")},

diff --git a/tests/rpmbuild.at b/tests/rpmbuild.at
@@ -835,21 +835,23 @@ RPMDB_INIT
 runroot rpmbuild -bb --quiet \
 	--define "pkg weakdeps" \
 	--define "recs foo > 1.2.3" \
+	--define "recflags post" \
 	--define "sugs bar >= 0.1.2" \
 	--define "sups baz" \
+	--define "supflags preun" \
 	--define "ens zap = 3" \
 	  /data/SPECS/deptest.spec
 
-runroot rpm -qp --recommends /build/RPMS/noarch/deptest-weakdeps-1.0-1.noarch.rpm
-runroot rpm -qp --suggests /build/RPMS/noarch/deptest-weakdeps-1.0-1.noarch.rpm
-runroot rpm -qp --supplements /build/RPMS/noarch/deptest-weakdeps-1.0-1.noarch.rpm
-runroot rpm -qp --enhances /build/RPMS/noarch/deptest-weakdeps-1.0-1.noarch.rpm
+runroot rpm -qpv --recommends /build/RPMS/noarch/deptest-weakdeps-1.0-1.noarch.rpm
+runroot rpm -qpv --suggests /build/RPMS/noarch/deptest-weakdeps-1.0-1.noarch.rpm
+runroot rpm -qpv --supplements /build/RPMS/noarch/deptest-weakdeps-1.0-1.noarch.rpm
+runroot rpm -qpv --enhances /build/RPMS/noarch/deptest-weakdeps-1.0-1.noarch.rpm
 ],
 [0],
-[foo > 1.2.3
-bar >= 0.1.2
-baz
-zap = 3
+[post: foo > 1.2.3
+manual: bar >= 0.1.2
+preun: baz
+manual: zap = 3
 ],
 [ignore])
 RPMTEST_CLEANUP