1.1 --- a/rpm.c	Sat Apr 05 01:02:12 2008 -0400
     1.2 +++ b/rpm.c	Sun Apr 06 23:57:13 2008 -0400
     1.3 @@ -542,7 +542,7 @@
     1.4  int
     1.5  razor_importer_add_rpm(struct razor_importer *importer, struct razor_rpm *rpm)
     1.6  {
     1.7 -	const char *name, *version, *release;
     1.8 +	const char *name, *version, *release, *arch;
     1.9  	const uint_32 *epoch;
    1.10  	char evr[128], buf[16];
    1.11  
    1.12 @@ -550,6 +550,7 @@
    1.13  	epoch = razor_rpm_get_indirect(rpm, RPMTAG_EPOCH, NULL);
    1.14  	version = razor_rpm_get_indirect(rpm, RPMTAG_VERSION, NULL);
    1.15  	release = razor_rpm_get_indirect(rpm, RPMTAG_RELEASE, NULL);
    1.16 +	arch = razor_rpm_get_indirect(rpm, RPMTAG_ARCH, NULL);
    1.17  
    1.18  	if (epoch) {
    1.19  		snprintf(buf, sizeof buf, "%u", ntohl(*epoch));
    1.20 @@ -557,7 +558,7 @@
    1.21  	} else {
    1.22  		razor_build_evr(evr, sizeof evr, NULL, version, release);
    1.23  	}
    1.24 -	razor_importer_begin_package(importer, name, evr);
    1.25 +	razor_importer_begin_package(importer, name, evr, arch);
    1.26  
    1.27  	import_properties(importer, RAZOR_PROPERTY_REQUIRES, rpm,
    1.28  			  RPMTAG_REQUIRENAME,
    1.29 @@ -621,7 +622,7 @@
    1.30  	rpmdbMatchIterator iter;
    1.31  	Header h;
    1.32  	int_32 type, count, i;
    1.33 -	union rpm_entry name, epoch, version, release;
    1.34 +	union rpm_entry name, epoch, version, release, arch;
    1.35  	union rpm_entry basenames, dirnames, dirindexes;
    1.36  	char filename[PATH_MAX], evr[128], buf[16];
    1.37  	rpmdb db;
    1.38 @@ -641,6 +642,7 @@
    1.39  		headerGetEntry(h, RPMTAG_EPOCH, &type, &epoch.p, &count);
    1.40  		headerGetEntry(h, RPMTAG_VERSION, &type, &version.p, &count);
    1.41  		headerGetEntry(h, RPMTAG_RELEASE, &type, &release.p, &count);
    1.42 +		headerGetEntry(h, RPMTAG_ARCH, &type, &arch.p, &count);
    1.43  
    1.44  		if (epoch.flags != NULL) {
    1.45  			snprintf(buf, sizeof buf, "%u", *epoch.flags);
    1.46 @@ -651,7 +653,8 @@
    1.47  					NULL, version.string, release.string);
    1.48  		}
    1.49  
    1.50 -		razor_importer_begin_package(importer, name.string, evr);
    1.51 +		razor_importer_begin_package(importer,
    1.52 +					     name.string, evr, arch.string);
    1.53  
    1.54  		add_properties(importer, RAZOR_PROPERTY_REQUIRES, h,
    1.55  			       RPMTAG_REQUIRENAME,