dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-zeroinstall-injector-0.23.tar.gz.gpg

.gitignore

@@ -0,0 +1 @@
+zeroinstall-injector-0.24.tar.gz.gpg

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: zeroinstall-injector
-# $Id$
-NAME := zeroinstall-injector
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-52ad9f0b49e3f35ff9490d5a3fc98843  zeroinstall-injector-0.23.tar.gz.gpg
+d543beb1742374b1d2d983f0d05388fc  zeroinstall-injector-0.24.tar.gz.gpg

zeroinstall-injector.spec

@@ -1,19 +1,19 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:    zeroinstall-injector
-Version: 0.23
+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
 BuildRequires: python gnupg
-Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires: PyXML pygtk2 gnupg
 
 %description
@@ -29,13 +29,14 @@ 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
 
 %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
@@ -48,19 +49,22 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{python_sitelib}/zeroinstall/0launch-gui/
 %dir %{python_sitelib}/zeroinstall/injector/
 %dir %{python_sitelib}/zeroinstall/zerostore/
-%ghost %{python_sitelib}/zeroinstall/*.pyo
+%{python_sitelib}/zeroinstall/*.py*
-%{python_sitelib}/zeroinstall/*.py
-%{python_sitelib}/zeroinstall/*.pyc
-%ghost %{python_sitelib}/zeroinstall/*/*.pyo
 %{python_sitelib}/zeroinstall/0launch-gui/0launch-gui
 %{python_sitelib}/zeroinstall/0launch-gui/README
 %{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml
-%{python_sitelib}/zeroinstall/*/*.py
+%{python_sitelib}/zeroinstall/*/*.py*
-%{python_sitelib}/zeroinstall/*/*.pyc
 %{_mandir}/man1/0*
 
 
 %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
+
 * Sun Oct  8 2006 Michel Salim <michel.salim@gmail.com> 0.23-1
 - Update to 0.23
 

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, []):