From c5214a1c3023d051cf6026c67799ffb3db9c8139 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Nov 11 2006 17:46:20 +0000
Subject: Enable support for ix86 binaries in x86_64


---

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index f838006..b2659a2 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -2,13 +2,14 @@
 
 Name:    zeroinstall-injector
 Version: 0.24
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
 License: LGPL
 URL:     http://0install.net
 Source0: http://osdn.dl.sf.net/sourceforge/zero-install/%{name}-%{version}.tar.gz.gpg
+Patch0:  zeroinstall-x86_64-arch.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -28,6 +29,7 @@ versions are available, and downloads and runs the ones you choose.
 %prep
 gpg --decrypt %{SOURCE0} | gzip -cd - | tar xvf -
 %setup -q -T -D
+%patch0 -p1 -b .arch
 
 %build
 %{__python} setup.py build
@@ -56,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 11 2006 Michel Salim <michel.salim@gmail.com> 0.24-2
+- Allow installation of ix86 binaries on x86_64
+
 * Sat Nov  4 2006 Michel Salim <michel.salim@gmail.com> 0.24-1
 - Update to 0.24
 - Not ghosting .pyos any longer
diff --git a/zeroinstall-x86_64-arch.patch b/zeroinstall-x86_64-arch.patch
new file mode 100644
index 0000000..01bf822
--- /dev/null
+++ b/zeroinstall-x86_64-arch.patch
@@ -0,0 +1,10 @@
+--- zeroinstall-injector-0.24/zeroinstall/injector/arch.py.orig	2006-10-08 08:14:49.000000000 -0400
++++ zeroinstall-injector-0.24/zeroinstall/injector/arch.py	2006-11-11 12:30:07.000000000 -0500
+@@ -42,6 +42,7 @@
+ 		'i486': ['i386'],
+ 		'i586': ['i486', 'i386'],
+ 		'i686': ['i586', 'i486', 'i386'],
++		'x86_64': ['i686', 'i586', 'i486', 'i386'],
+ 		'ppc64': ['ppc32'],
+ 	}
+ 	for supported in _machine_matrix.get(this_machine, []):