From 7e7dcb1009b23d40318f75b313abbf9baba11eff Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 19:47:46 +0000 Subject: [PATCH 1/5] Initialize branch FC-6 for zeroinstall-injector --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 41787b064875086869cfbfc95b6452221d5ad6d4 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Sun, 5 Nov 2006 00:00:32 +0000 Subject: [PATCH 2/5] Update to 0.24 --- .cvsignore | 2 +- sources | 2 +- zeroinstall-injector.spec | 17 ++++++++--------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index 84d77a9..7d893c9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zeroinstall-injector-0.23.tar.gz.gpg +zeroinstall-injector-0.24.tar.gz.gpg diff --git a/sources b/sources index 2b7a2ed..4c61f00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -52ad9f0b49e3f35ff9490d5a3fc98843 zeroinstall-injector-0.23.tar.gz.gpg +d543beb1742374b1d2d983f0d05388fc zeroinstall-injector-0.24.tar.gz.gpg diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec index fee412a..f838006 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -1,7 +1,7 @@ %{!?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} Summary: The Zero Install Injector (0launch) @@ -13,7 +13,6 @@ 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 @@ -35,7 +34,7 @@ gpg --decrypt %{SOURCE0} | gzip -cd - | tar xvf - %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 +47,19 @@ 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/*.pyc -%ghost %{python_sitelib}/zeroinstall/*/*.pyo +%{python_sitelib}/zeroinstall/*.py* %{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/*/*.pyc +%{python_sitelib}/zeroinstall/*/*.py* %{_mandir}/man1/0* %changelog +* Sat Nov 4 2006 Michel Salim 0.24-1 +- Update to 0.24 +- Not ghosting .pyos any longer + * Sun Oct 8 2006 Michel Salim 0.23-1 - Update to 0.23 From ddb9a830a7d408b4c9469fa6835d657558e2d30f Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Sat, 11 Nov 2006 17:46:19 +0000 Subject: [PATCH 3/5] Enable support for ix86 binaries in x86_64 --- zeroinstall-injector.spec | 7 ++++++- zeroinstall-x86_64-arch.patch | 10 ++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 zeroinstall-x86_64-arch.patch 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 0.24-2 +- Allow installation of ix86 binaries on x86_64 + * Sat Nov 4 2006 Michel Salim 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, []): From 9bbd76993429e92e8c8802e0ff2664ae2046978f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:08:51 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d195006..18ceb05 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 70eb9f903468d608a2d85bfdab2d31397b4cf58e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:29:11 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 18ceb05..0000000 --- a/Makefile +++ /dev/null @@ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6