Um, please start some discussion before just adding
two new dependency types to rpmds.
I'm strongly opposed to adding 2 new dependency types
within package content.
RPMSENSE_MISSINGOK to modify the meaning of existing
Requires: and Provides: is more than sufficient.
73 de Jeff
On Mar 14, 2008, at 7:22 PM, Olivier Thauvin wrote:
> RPM Package Manager, CVS Repository
> http://rpm5.org/cvs/
>
> ______________________________________________________________________
> ______
>
> Server: rpm5.org Name: Olivier Thauvin
> Root: /v/rpm/cvs Email: nanardon@rpm5.org
> Module: rpm Date: 15-Mar-2008
> 00:22:22
> Branch: HEAD Handle: 2008031423222100
>
> Modified files:
> rpm/lib rpmds.c
>
> Log:
> - allow rpmdsNew to handle suggests and enhances dependencies
>
> Summary:
> Revision Changes Path
> 2.94 +30 -0 rpm/lib/rpmds.c
>
> ______________________________________________________________________
> ______
>
> patch -p0 <<'@@ .'
> Index: rpm/lib/rpmds.c
>
> ======================================================================
> ======
> $ cvs diff -u -r2.93 -r2.94 rpmds.c
> --- rpm/lib/rpmds.c 12 Mar 2008 18:11:08 -0000 2.93
> +++ rpm/lib/rpmds.c 14 Mar 2008 23:22:21 -0000 2.94
> @@ -174,6 +174,14 @@
> tagEVR = RPMTAG_TRIGGERVERSION;
> tagF = RPMTAG_TRIGGERFLAGS;
> } else
> + if (ds->tagN == RPMTAG_SUGGESTSNAME) {
> + tagEVR = RPMTAG_SUGGESTSVERSION;
> + tagF = RPMTAG_SUGGESTSFLAGS;
> + } else
> + if (ds->tagN == RPMTAG_ENHANCESNAME) {
> + tagEVR = RPMTAG_ENHANCESVERSION;
> + tagF = RPMTAG_ENHANCESFLAGS;
> + } else
> if (ds->tagN == RPMTAG_DIRNAMES) {
> tagEVR = 0;
> tagF = 0;
> @@ -274,6 +282,16 @@
> tagEVR = RPMTAG_TRIGGERVERSION;
> tagF = RPMTAG_TRIGGERFLAGS;
> } else
> + if (tagN == RPMTAG_SUGGESTSNAME) {
> + Type = "Suggests";
> + tagEVR = RPMTAG_SUGGESTSVERSION;
> + tagF = RPMTAG_SUGGESTSFLAGS;
> + } else
> + if (tagN == RPMTAG_ENHANCESNAME) {
> + Type = "Enhances";
> + tagEVR = RPMTAG_ENHANCESVERSION;
> + tagF = RPMTAG_ENHANCESFLAGS;
> + } else
> if (tagN == RPMTAG_DIRNAMES) {
> Type = "Dirnames";
> tagEVR = 0;
> @@ -499,6 +517,12 @@
> if (tagN == RPMTAG_TRIGGERNAME) {
> Type = "Triggers";
> } else
> + if (tagN == RPMTAG_SUGGESTSNAME) {
> + Type = "Suggests";
> + } else
> + if (tagN == RPMTAG_ENHANCESNAME) {
> + Type = "Enhances";
> + } else
> if (tagN == RPMTAG_DIRNAMES) {
> Type = "Dirnames";
> } else
> @@ -584,6 +608,12 @@
> if (tagN == RPMTAG_TRIGGERNAME) {
> Type = "Triggers";
> } else
> + if (tagN == RPMTAG_SUGGESTSNAME) {
> + Type = "Suggests";
> + } else
> + if (tagN == RPMTAG_ENHANCESNAME) {
> + Type = "Enhances";
> + } else
> if (tagN == RPMTAG_DIRNAMES) {
> Type = "Dirnames";
> } else
> @@ .
> ______________________________________________________________________
> RPM Package Manager http://rpm5.org
> CVS Sources Repository rpm-cvs@rpm5.org
Received on Sat Mar 15 02:33:34 2008