rpms/zeroinstall-injector/FC-3 zeroinstall-x86_64-arch.patch, NONE, 1.1 zeroinstall-injector.spec, 1.3, 1.4

[Michel Alexandre Salim (salimma)]

Author: salimma

Update of /cvs/extras/rpms/zeroinstall-injector/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12391/FC-3

Modified Files:
	zeroinstall-injector.spec 
Added Files:
	zeroinstall-x86_64-arch.patch 
Log Message:
Enable support for ix86 binaries in x86_64


zeroinstall-x86_64-arch.patch:

--- NEW FILE zeroinstall-x86_64-arch.patch ---
--- 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, []):


Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/extras/rpms/zeroinstall-injector/FC-3/zeroinstall-injector.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zeroinstall-injector.spec	5 Nov 2006 00:00:24 -0000	1.3
+++ zeroinstall-injector.spec	11 Nov 2006 17:46:12 -0000	1.4
@@ -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
@@ -29,13 +30,14 @@
 %prep
 gpg --decrypt %{SOURCE0} | gzip -cd - | tar xvf -
 %setup -q -T -D
+%patch0 -p1 -b .arch
 
 %build
 %{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,6 +59,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Michel Salim <michel.salim at gmail.com> 0.24-2
+- Allow installation of ix86 binaries on x86_64
+
 * Sat Nov  4 2006 Michel Salim <michel.salim at gmail.com> 0.24-1
 - Update to 0.24
 - Not ghosting .pyos any longer