From 7260416fe36db857bb24221702d33489de49a225 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 03:35:46 +0000 Subject: [PATCH 1/6] Initialize branch F-13 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..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 7efbf822a5d640161599b5f96139c2b210f111f3 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 9 Jul 2010 10:32:18 +0000 Subject: [PATCH 2/6] - Update to 0.49 --- .cvsignore | 2 +- sources | 2 +- zeroinstall-injector.spec | 49 ++++++++++++++++++++++----------------- 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/.cvsignore b/.cvsignore index add7126..2f9bbc9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zeroinstall-injector-0.38.tar.bz2 +zeroinstall-injector-0.49.tar.bz2 diff --git a/sources b/sources index 81d6906..735e663 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e341afd77ac603a2306baf2b8513f195 zeroinstall-injector-0.38.tar.bz2 +64a356e2fab8ca267240b7e44a73c51f zeroinstall-injector-0.49.tar.bz2 diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec index 956ef06..0de9cf0 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -3,38 +3,41 @@ %define cache_dir /var/cache/0install.net Name: zeroinstall-injector -Version: 0.38 -Release: 3%{?dist} +Version: 0.49 +Release: 1%{?dist} Summary: The Zero Install Injector (0launch) Group: Applications/System License: LGPLv2 URL: http://0install.net -Source0: http://dl.sf.net/sourceforge/zero-install/%{name}-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/zero-install/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python-devel desktop-file-utils -Requires: PyXML pygtk2 gnupg pygtk2-libglade sudo xdg-utils +BuildRequires: python-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext +Requires: PyXML pygtk2 gnupg sudo xdg-utils tar gzip Requires(pre): shadow-utils %description -The Zero Install Injector makes it easy for users to install software without -needing root privileges. It takes the URL of a program and runs it -(downloading it first if necessary). Any dependencies of the program are -fetched in the same way. The user controls which version of the program and -its dependencies to use. +The Zero Install Injector makes it easy for users to install software +without needing root privileges. It takes the URL of a program and +runs it (downloading it first if necessary). Any dependencies of the +program are fetched in the same way. The user controls which version +of the program and its dependencies to use. -Zero Install is a decentralised installation system (there is no central -repository; all packages are identified by URLs), loosly-coupled (if different -programs require different versions of a library then both versions are -installed in parallel, without conflicts), and has an emphasis on security -(all package descriptions are GPG-signed, and contain cryptographic hashes of -the contents of each version). Each version of each program is stored in its -own sub-directory within the Zero Install cache (nothing is installed to -directories outside of the cache, such as /usr/bin) and no code from the -package is run during install or uninstall. The system can automatically check -for updates when software is run. +Zero Install is a decentralized installation system (there is no +central repository; all packages are identified by URLs), +loosely-coupled (if different programs require different versions of a +library then both versions are installed in parallel, without +conflicts), and has an emphasis on security (all package descriptions +are GPG-signed, and contain cryptographic hashes of the contents of +each version). Each version of each program is stored in its own +sub-directory within the Zero Install cache (nothing is installed to +directories outside of the cache, such as /usr/bin) and no code from +the package is run during install or uninstall. The system can +automatically check for updates when software is run. %prep %setup -q @@ -58,6 +61,7 @@ for i in add manage; do --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/zeroinstall-$i.desktop done +%find_lang zero-install %clean rm -rf $RPM_BUILD_ROOT @@ -72,7 +76,7 @@ useradd -r -g zeroinst -d %{cache_dir} -s /sbin/nologin \ -c "Zero Install shared cache" zeroinst exit 0 -%files +%files -f zero-install.lang %defattr(-,root,root,-) %doc COPYING README %{_bindir}/0* @@ -89,6 +93,9 @@ exit 0 %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations %changelog +* Fri Jul 9 2010 Michel Salim - 0.49-1 +- Update to 0.49 + * Mon Jul 27 2009 Fedora Release Engineering - 0.38-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 19fd980382fd612225b3b7ff60883240ef868809 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 9 Jul 2010 11:06:27 +0000 Subject: [PATCH 3/6] Package Python eggs on all but EL5 --- zeroinstall-injector.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec index 0de9cf0..5908f47 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -85,7 +85,7 @@ exit 0 %{_datadir}/desktop-directories/zeroinstall.directory %{_datadir}/pixmaps/zeroinstall-zero2desktop.png %{python_sitelib}/zeroinstall/ -%if 0%{?fedora} >= 9 +%if %{!?el5:1} %{python_sitelib}/*.egg-info %endif %{_mandir}/man1/0* From 87aa6095559cd9a1175ba2c6b81bcdf3fbb67dc7 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 9 Jul 2010 15:23:04 +0000 Subject: [PATCH 4/6] - Enable tests --- zeroinstall-injector-0.49-any-arch.patch | 16 +++++++++++++++ zeroinstall-injector.spec | 25 ++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 zeroinstall-injector-0.49-any-arch.patch diff --git a/zeroinstall-injector-0.49-any-arch.patch b/zeroinstall-injector-0.49-any-arch.patch new file mode 100644 index 0000000..5cd2009 --- /dev/null +++ b/zeroinstall-injector-0.49-any-arch.patch @@ -0,0 +1,16 @@ +--- zeroinstall-injector-0.49/tests/testdistro.py.any-arch 2010-07-03 15:38:46.000000000 +0200 ++++ zeroinstall-injector-0.49/tests/testdistro.py 2010-07-09 16:42:36.777158793 +0200 +@@ -207,9 +207,11 @@ + factory = self.make_factory(ports) + ports.get_package_info('zeroinstall-injector', factory) + self.assertEquals(1, len(self.feed.implementations)) +- impl = self.feed.implementations['package:ports:zeroinstall-injector:0.41-2:x86_64'] ++ import platform ++ machine = platform.machine() ++ impl = self.feed.implementations['package:ports:zeroinstall-injector:0.41-2:'+machine] + self.assertEquals('0.41-2', impl.get_version()) +- self.assertEquals('x86_64', impl.machine) ++ self.assertEquals(machine, impl.machine) + + def testCleanVersion(self): + self.assertEquals('0.3.1-1', distro.try_cleanup_distro_version('1:0.3.1-1')) diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec index 5908f47..366c617 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -4,20 +4,29 @@ Name: zeroinstall-injector Version: 0.49 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Zero Install Injector (0launch) Group: Applications/System License: LGPLv2 URL: http://0install.net Source0: http://downloads.sourceforge.net/zero-install/%{name}-%{version}.tar.bz2 +# https://sourceforge.net/tracker/?group_id=76468&atid=547191 +Patch0: %{name}-0.49-any-arch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel BuildRequires: desktop-file-utils BuildRequires: gettext -Requires: PyXML pygtk2 gnupg sudo xdg-utils tar gzip +# for-tests +BuildRequires: PyXML pygtk2 gnupg xdg-utils +BuildRequires: tar gzip bzip2 xz-lzma-compat +# /for-tests +Requires: PyXML pygtk2 gnupg sudo xdg-utils +Requires: tar gzip bzip2 xz-lzma-compat +# for PackageKit support +Requires: dbus-python Requires(pre): shadow-utils %description @@ -41,6 +50,7 @@ automatically check for updates when software is run. %prep %setup -q +%patch0 -p1 -b .any-arch %build %{__python} setup.py build @@ -63,9 +73,17 @@ for i in add manage; do done %find_lang zero-install +%check +cd tests +for t in download packagekit; do + mv test${t}.py{,.off} +done +./testall.py + %clean rm -rf $RPM_BUILD_ROOT + %pre # Add the "zeroinst" user. # This is not used by default, but is required if you want to @@ -93,6 +111,9 @@ exit 0 %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations %changelog +* Fri Jul 9 2010 Michel Salim - 0.49-2 +- Enable tests + * Fri Jul 9 2010 Michel Salim - 0.49-1 - Update to 0.49 From e15d6aac99be551e907ef2543ffc6065b939cefe Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 9 Jul 2010 15:52:36 +0000 Subject: [PATCH 5/6] commit EL-5 detection fix to other branches as well; make sure next update does not clobber it --- zeroinstall-injector.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec index 366c617..28c1ad2 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -103,7 +103,7 @@ exit 0 %{_datadir}/desktop-directories/zeroinstall.directory %{_datadir}/pixmaps/zeroinstall-zero2desktop.png %{python_sitelib}/zeroinstall/ -%if %{!?el5:1} +%if 0%{!?el5:1} %{python_sitelib}/*.egg-info %endif %{_mandir}/man1/0* From 687c49d908cfa1080446bf939fa10ed43e540dd0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:28:59 +0000 Subject: [PATCH 6/6] 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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13