1.1 --- a/import.c	Wed Oct 24 00:50:29 2007 -0400
     1.2 +++ b/import.c	Wed Oct 24 12:21:29 2007 -0400
     1.3 @@ -318,8 +318,9 @@
     1.4  		headerGetEntry(h, RPMTAG_NAME, &type, &name.p, &count);
     1.5  		headerGetEntry(h, RPMTAG_VERSION, &type, &version.p, &count);
     1.6  		headerGetEntry(h, RPMTAG_RELEASE, &type, &release.p, &count);
     1.7 -		razor_importer_begin_package(importer,
     1.8 -					     name.string, version.string);
     1.9 +		snprintf(filename, sizeof filename, "%s-%s",
    1.10 +			 version.string, release.string);
    1.11 +		razor_importer_begin_package(importer, name.string, filename);
    1.12  
    1.13  		headerGetEntry(h, RPMTAG_REQUIRENAME, &type,
    1.14  			       &property_names.p, &count);

     2.1 --- a/razor.c	Wed Oct 24 00:50:29 2007 -0400
     2.2 +++ b/razor.c	Wed Oct 24 12:21:29 2007 -0400
     2.3 @@ -930,7 +930,7 @@
     2.4  		if (pattern && fnmatch(pattern, &pool[p->name], 0) != 0)
     2.5  		    continue;
     2.6  		if (with_version)
     2.7 -			printf("%s %s\n", &pool[p->name], &pool[p->version]);
     2.8 +			printf("%s-%s\n", &pool[p->name], &pool[p->version]);
     2.9  		else
    2.10  			printf("%s\n", &pool[p->name]);
    2.11  	}
    2.12 @@ -997,7 +997,7 @@
    2.13  	pool = set->string_pool.data;
    2.14  	end = properties->data + properties->size;
    2.15  	for (p = properties->data; p < end; p++)
    2.16 -		printf("%s %s\n", &pool[p->name], &pool[p->version]);
    2.17 +		printf("%s-%s\n", &pool[p->name], &pool[p->version]);
    2.18  }
    2.19  
    2.20  void
    2.21 @@ -1016,7 +1016,7 @@
    2.22  		pool = set->string_pool.data;
    2.23  		while (~*r) {
    2.24  			p = &requires[*r++];
    2.25 -			printf("%s %s\n", &pool[p->name], &pool[p->version]);
    2.26 +			printf("%s-%s\n", &pool[p->name], &pool[p->version]);
    2.27  		}
    2.28  	} else
    2.29  		razor_set_list_all_properties(set, &set->requires);
    2.30 @@ -1038,7 +1038,7 @@
    2.31  		pool = set->string_pool.data;
    2.32  		while (~*r) {
    2.33  			p = &provides[*r++];
    2.34 -			printf("%s %s\n", &pool[p->name], &pool[p->version]);
    2.35 +			printf("%s-%s\n", &pool[p->name], &pool[p->version]);
    2.36  		}
    2.37  	} else 
    2.38  		razor_set_list_all_properties(set, &set->provides);
    2.39 @@ -1069,7 +1069,7 @@
    2.40  			set->package_pool.data + property->packages;
    2.41  		while (~*r) {
    2.42  			p = &packages[*r++];
    2.43 -			printf("%s %s\n",
    2.44 +			printf("%s-%s\n",
    2.45  			       &pool[p->name], &pool[p->version]);
    2.46  		}
    2.47  	next:
    2.48 @@ -1175,7 +1175,7 @@
    2.49  	pool = set->string_pool.data;
    2.50  	while (~*r) {
    2.51  		p = &packages[*r++];
    2.52 -		printf("%s %s\n", &pool[p->name], &pool[p->version]);
    2.53 +		printf("%s-%s\n", &pool[p->name], &pool[p->version]);
    2.54  	}
    2.55  }
    2.56  
    2.57 @@ -1304,7 +1304,7 @@
    2.58  
    2.59  	for (u = unsatisfied.data; u < end; u++) {
    2.60  		r = requires + *u;
    2.61 -		printf("%s %s not satisfied\n",
    2.62 +		printf("%s-%s not satisfied\n",
    2.63  		       &pool[r->name], &pool[r->version]);
    2.64  	}
    2.65