- permit Conflicts: /path/to/file.

CVS patchset: 7476
CVS date: 2004/10/17 18:44:15

CHANGES

@@ -20,6 +20,7 @@
 	- adjust digest/signature stats to count #pkgs and bytes.
 	- obsolete Serial:, Copyright:, and RHNPlatform: syntax in spec files.
 	- permit Obsoletes: /path/to/file.
+	- permit Conflicts: /path/to/file.
 
 4.3.1 -> 4.3.2:
 	- use /etc/selinux/targeted/contexts/files/file_contexts for now.

build/parseReqs.c

@@ -104,20 +104,6 @@ int parseRCPOT(Spec spec, Package pkg, const char *field, rpmTag tagN,
 	    return RPMERR_BADSPEC;
 	}
 
-	/* Don't permit file names as args for certain tags */
-	switch (tagN) {
-	case RPMTAG_CONFLICTFLAGS:
-	case RPMTAG_BUILDCONFLICTS:
-	    if (r[0] == '/') {
-		rpmError(RPMERR_BADSPEC,_("line %d: File name not permitted: %s\n"),
-			 spec->lineNum, spec->line);
-		return RPMERR_BADSPEC;
-	    }
-	    /*@switchbreak@*/ break;
-	default:
-	    /*@switchbreak@*/ break;
-	}
-
 	re = r;
 	SKIPNONWHITE(re);
 	N = xmalloc((re-r) + 1);