Remove long since dead rpmrc provides code

3 files changed, 0 insertions, 37 deletions

diff --git a/lib/depends.c b/lib/depends.c
index 723f46bc5..b19ed591e 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -431,30 +431,6 @@ static int unsatisfiedDepend(rpmts ts, rpmds dep, int adding)
 retry:
     rc = 0;	/* assume dependency is satisfied */
 
-#if defined(DYING)
-  { static const char noProvidesString[] = "nada";
-    static const char * rcProvidesString = noProvidesString;
-    int_32 Flags = rpmdsFlags(dep);
-    const char * start;
-    int i;
-
-    if (rcProvidesString == noProvidesString)
-	rcProvidesString = rpmGetVar(RPMVAR_PROVIDES);
-
-    if (rcProvidesString != NULL && !(Flags & RPMSENSE_SENSEMASK)) {
-
-	i = strlen(Name);
-	while ((start = strstr(rcProvidesString, Name))) {
-	    if (xisspace(start[i]) || start[i] == '\0' || start[i] == ',') {
-		rpmdsNotify(dep, _("(rpmrc provides)"), rc);
-		goto exit;
-	    }
-	    rcProvidesString = start + 1;
-	}
-    }
-  }
-#endif
-
     /*
      * New features in rpm packaging implicitly add versioned dependencies
      * on rpmlib provides. The dependencies look like "rpmlib(YaddaYadda)".
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index ed222d160..cf6cc4575 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -550,7 +550,6 @@ typedef	enum rpmsenseFlags_e {
 
 /* Stuff for maintaining "variables" like SOURCEDIR, BUILDDIR, etc */
 #define	RPMVAR_OPTFLAGS			3
-#define	RPMVAR_PROVIDES			38
 #define	RPMVAR_INCLUDE			43
 #define	RPMVAR_MACROFILES		49
 
diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 9d2260436..f206fba95 100644
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -125,7 +125,6 @@ static struct rpmOption optionTable[] = {
     { "include",		RPMVAR_INCLUDE,			0, 1,	0, 2 },
     { "macrofiles",		RPMVAR_MACROFILES,		0, 0,	0, 1 },
     { "optflags",		RPMVAR_OPTFLAGS,		1, 0,	1, 0 },
-    { "provides",               RPMVAR_PROVIDES,                0, 0,	0, 0 },
 };
 
 static int optionTableSize = sizeof(optionTable) / sizeof(*optionTable);
@@ -620,17 +619,6 @@ static int doReadRC( FD_t fd, const char * urlfn)
 		if (rc) return rc;
 		continue;	/* XXX don't save include value as var/macro */
 	      }	break;
-	    case RPMVAR_PROVIDES:
-	      {	char *t;
-		s = rpmGetVar(RPMVAR_PROVIDES);
-		if (s == NULL) s = "";
-		fn = t = xmalloc(strlen(s) + strlen(se) + 2);
-		while (*s != '\0') *t++ = *s++;
-		*t++ = ' ';
-		while (*se != '\0') *t++ = *se++;
-		*t++ = '\0';
-		se = (char *)fn;
-	      }	break;
 	    default:
 		break;
 	    }