# HG changeset patch
# User Kristian H?gsberg <krh@redhat.com>
# Date 1193242889 14400
# Node ID c525dec02ef4c53e572a7b48faaeea6ff5dc6190
# Parent  3403937e09136b529e2c9e96b5d22d1a1c176a52
Import rpm release as part of the version.

diff -r 3403937e0913 -r c525dec02ef4 import.c
--- a/import.c	Wed Oct 24 00:50:29 2007 -0400
+++ b/import.c	Wed Oct 24 12:21:29 2007 -0400
@@ -318,8 +318,9 @@
 		headerGetEntry(h, RPMTAG_NAME, &type, &name.p, &count);
 		headerGetEntry(h, RPMTAG_VERSION, &type, &version.p, &count);
 		headerGetEntry(h, RPMTAG_RELEASE, &type, &release.p, &count);
-		razor_importer_begin_package(importer,
-					     name.string, version.string);
+		snprintf(filename, sizeof filename, "%s-%s",
+			 version.string, release.string);
+		razor_importer_begin_package(importer, name.string, filename);
 
 		headerGetEntry(h, RPMTAG_REQUIRENAME, &type,
 			       &property_names.p, &count);
diff -r 3403937e0913 -r c525dec02ef4 razor.c
--- a/razor.c	Wed Oct 24 00:50:29 2007 -0400
+++ b/razor.c	Wed Oct 24 12:21:29 2007 -0400
@@ -930,7 +930,7 @@
 		if (pattern && fnmatch(pattern, &pool[p->name], 0) != 0)
 		    continue;
 		if (with_version)
-			printf("%s %s\n", &pool[p->name], &pool[p->version]);
+			printf("%s-%s\n", &pool[p->name], &pool[p->version]);
 		else
 			printf("%s\n", &pool[p->name]);
 	}
@@ -997,7 +997,7 @@
 	pool = set->string_pool.data;
 	end = properties->data + properties->size;
 	for (p = properties->data; p < end; p++)
-		printf("%s %s\n", &pool[p->name], &pool[p->version]);
+		printf("%s-%s\n", &pool[p->name], &pool[p->version]);
 }
 
 void
@@ -1016,7 +1016,7 @@
 		pool = set->string_pool.data;
 		while (~*r) {
 			p = &requires[*r++];
-			printf("%s %s\n", &pool[p->name], &pool[p->version]);
+			printf("%s-%s\n", &pool[p->name], &pool[p->version]);
 		}
 	} else
 		razor_set_list_all_properties(set, &set->requires);
@@ -1038,7 +1038,7 @@
 		pool = set->string_pool.data;
 		while (~*r) {
 			p = &provides[*r++];
-			printf("%s %s\n", &pool[p->name], &pool[p->version]);
+			printf("%s-%s\n", &pool[p->name], &pool[p->version]);
 		}
 	} else 
 		razor_set_list_all_properties(set, &set->provides);
@@ -1069,7 +1069,7 @@
 			set->package_pool.data + property->packages;
 		while (~*r) {
 			p = &packages[*r++];
-			printf("%s %s\n",
+			printf("%s-%s\n",
 			       &pool[p->name], &pool[p->version]);
 		}
 	next:
@@ -1175,7 +1175,7 @@
 	pool = set->string_pool.data;
 	while (~*r) {
 		p = &packages[*r++];
-		printf("%s %s\n", &pool[p->name], &pool[p->version]);
+		printf("%s-%s\n", &pool[p->name], &pool[p->version]);
 	}
 }
 
@@ -1304,7 +1304,7 @@
 
 	for (u = unsatisfied.data; u < end; u++) {
 		r = requires + *u;
-		printf("%s %s not satisfied\n",
+		printf("%s-%s not satisfied\n",
 		       &pool[r->name], &pool[r->version]);
 	}