1.1 --- a/import.c	Thu Oct 25 13:21:26 2007 -0400
     1.2 +++ b/import.c	Wed Oct 31 22:41:27 2007 -0400
     1.3 @@ -60,10 +60,12 @@
     1.4  
     1.5  	switch ((int) data) {
     1.6  	case RZR_REQUIRES:
     1.7 -		razor_importer_add_requires(importer, name, version);
     1.8 +		razor_importer_add_property(importer, name, version,
     1.9 +					    RAZOR_PROPERTY_REQUIRES);
    1.10  		break;
    1.11  	case RZR_PROVIDES:
    1.12 -		razor_importer_add_provides(importer, name, version);
    1.13 +		razor_importer_add_property(importer, name, version,
    1.14 +					    RAZOR_PROPERTY_PROVIDES);
    1.15  		break;
    1.16  	}
    1.17  }
    1.18 @@ -229,10 +231,12 @@
    1.19  			
    1.20  		switch (ctx->state) {
    1.21  		case YUM_STATE_REQUIRES:
    1.22 -			razor_importer_add_requires(ctx->importer, n, buffer);
    1.23 +			razor_importer_add_property(ctx->importer, n, buffer,
    1.24 +						    RAZOR_PROPERTY_REQUIRES);
    1.25  			break;
    1.26  		case YUM_STATE_PROVIDES:
    1.27 -			razor_importer_add_provides(ctx->importer, n, buffer);
    1.28 +			razor_importer_add_property(ctx->importer, n, buffer,
    1.29 +						    RAZOR_PROPERTY_PROVIDES);
    1.30  			break;
    1.31  		}
    1.32  	} else if (strcmp(name, "file") == 0) {
    1.33 @@ -352,18 +356,20 @@
    1.34  		headerGetEntry(h, RPMTAG_REQUIREFLAGS, &type,
    1.35  			       &property_flags.p, &count);
    1.36  		for (i = 0; i < count; i++)
    1.37 -			razor_importer_add_requires(importer,
    1.38 +			razor_importer_add_property(importer,
    1.39  						    property_names.list[i],
    1.40 -						    property_versions.list[i]);
    1.41 +						    property_versions.list[i],
    1.42 +						    RAZOR_PROPERTY_REQUIRES);
    1.43  
    1.44  		headerGetEntry(h, RPMTAG_PROVIDENAME, &type,
    1.45  			       &property_names.p, &count);
    1.46  		headerGetEntry(h, RPMTAG_PROVIDEVERSION, &type,
    1.47  			       &property_versions.p, &count);
    1.48  		for (i = 0; i < count; i++)
    1.49 -			razor_importer_add_provides(importer,
    1.50 +			razor_importer_add_property(importer,
    1.51  						    property_names.list[i],
    1.52 -						    property_versions.list[i]);
    1.53 +						    property_versions.list[i],
    1.54 +						    RAZOR_PROPERTY_PROVIDES);
    1.55  
    1.56  		headerGetEntry(h, RPMTAG_BASENAMES, &type,
    1.57  			       &basenames.p, &count);