File findsupplements.diff of Package rpm

Overview Repositories Revisions Requests Users Attributes Meta

File findsupplements.diff of Package rpm (Revision 5c727c137293fc5ebdc3ea3428b1459f)

Currently displaying revision 5c727c137293fc5ebdc3ea3428b1459f , Show latest

Add support for supplements to the internal dependency generator.

--- ./build/rpmfc.c.orig	2012-06-01 13:44:21.000000000 +0000
+++ ./build/rpmfc.c	2012-06-01 14:00:45.000000000 +0000
@@ -57,6 +57,7 @@ struct rpmfc_s {
 
     rpmds provides;	/*!< (no. provides) package provides */
     rpmds requires;	/*!< (no. requires) package requires */
+    rpmds supplements;	/*!< (no. supplements) package supplements */
 };
 
 struct rpmfcTokens_s {
@@ -545,6 +546,22 @@ static int rpmfcHelperRequires(rpmfc fc,
     return 0;
 }
 
+/**
+ * Run per-interpreter Supplements: dependency helper.
+ * @param fc		file classifier
+ * @param nsdep		class name for interpreter (e.g. "perl")
+ * @return		0
+ */
+static int rpmfcHelperSupplements(rpmfc fc, const char * nsdep)
+{
+    if (fc->skipReq)
+	return 0;
+
+    rpmfcHelper(fc, nsdep, "supplements", &fc->supplements, RPMSENSE_FIND_REQUIRES|RPMSENSE_STRONG|RPMSENSE_MISSINGOK, RPMTAG_ENHANCESNAME);
+
+    return 0;
+}
+
 /* Only used for elf coloring and controlling RPMTAG_FILECLASS inclusion now */
 static const struct rpmfcTokens_s rpmfcTokens[] = {
   { "directory",		RPMFC_INCLUDE },
@@ -762,6 +779,7 @@ rpmfc rpmfcFree(rpmfc fc)
 
 	rpmdsFree(fc->provides);
 	rpmdsFree(fc->requires);
+	rpmdsFree(fc->supplements);
 	memset(fc, 0, sizeof(*fc)); /* trash and burn */
 	free(fc);
     }
@@ -793,6 +811,11 @@ rpmds rpmfcRequires(rpmfc fc)
     return (fc != NULL ? fc->requires : NULL);
 }
 
+rpmds rpmfcSupplements(rpmfc fc)
+{
+    return (fc != NULL ? fc->supplements : NULL);
+}
+
 rpmRC rpmfcApply(rpmfc fc)
 {
     const char * s;
@@ -814,6 +837,7 @@ rpmRC rpmfcApply(rpmfc fc)
 	for (ARGV_t fattr = fc->fattrs[fc->ix]; fattr && *fattr; fattr++) {
 	    rpmfcHelperProvides(fc, *fattr);
 	    rpmfcHelperRequires(fc, *fattr);
+	    rpmfcHelperSupplements(fc, *fattr);
 	}
     }
 
@@ -856,6 +880,11 @@ rpmRC rpmfcApply(rpmfc fc)
 	    dix = rpmdsFind(fc->requires, ds);
 	    rpmdsFree(ds);
 	    break;
+	case 'S':
+	    ds = rpmdsSingle(RPMTAG_ENHANCESNAME, N, EVR, Flags);
+	    dix = rpmdsFind(fc->supplements, ds);
+	    ds = rpmdsFree(ds);
+	    break;
 	}
 
 	if (dix < 0)
@@ -1347,6 +1376,18 @@ rpmRC rpmfcGenerateDepends(const rpmSpec
 	}
     }
 
+    /* Add Supplements: */
+    if (!fc->skipReq) {
+	rpmds pi = rpmdsInit(fc->supplements);
+	while (rpmdsNext(pi) >= 0) {
+	    rpmsenseFlags flags = rpmdsFlags(pi);
+	
+	    headerPutString(pkg->header, RPMTAG_ENHANCESNAME, rpmdsN(pi));
+	    headerPutString(pkg->header, RPMTAG_ENHANCESVERSION, rpmdsEVR(pi));
+	    headerPutUint32(pkg->header, RPMTAG_ENHANCESFLAGS, &flags, 1);
+	}
+    }
+
     /* Add dependency dictionary(#dependencies) */
     if (rpmtdFromArgi(&td, RPMTAG_DEPENDSDICT, fc->ddictx)) {
 	headerPut(pkg->header, &td, HEADERPUT_DEFAULT);
--- ./build/rpmfc.h.orig	2012-06-01 13:53:12.000000000 +0000
+++ ./build/rpmfc.h	2012-06-01 13:53:44.000000000 +0000
@@ -106,6 +106,13 @@ rpmds rpmfcProvides(rpmfc fc);
  */
 rpmds rpmfcRequires(rpmfc fc);
 
+/** \ingroup rpmfc
+ * Retrieve file classification supplements
+ * @param fc		file classifier
+ * @return		rpmds dependency set of fc requires
+ */
+rpmds rpmfcSupplements(rpmfc fc);
+
 #ifdef __cplusplus
 }
 #endif

Places

File findsupplements.diff of Package rpm (Revision 5c727c137293fc5ebdc3ea3428b1459f)

Places