From 5b26f05f7f8835d9b461416c7e4cf8cca67c8e24 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 26 Jan 2012 18:17:02 +0100 Subject: [PATCH 1/7] Update to 1.5 --- .gitignore | 2 +- sources | 2 +- zeroinstall-injector.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f18ab91..a7acccd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/zeroinstall-injector-1.2.tar.bz2 +/zeroinstall-injector-1.5.tar.bz2 diff --git a/sources b/sources index 329c616..cbac6da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f1cb7cb2a86f0b7d01add5991af2640 zeroinstall-injector-1.2.tar.bz2 +a1e0291183520875704386ddbc22cc5d zeroinstall-injector-1.5.tar.bz2 diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec index 32055b3..95db68e 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -4,7 +4,7 @@ #global prerel rc1 Name: zeroinstall-injector -Version: 1.2 +Version: 1.5 Release: 1%{?dist} Summary: The Zero Install Injector (0launch) @@ -128,6 +128,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations %changelog +* Thu Jan 26 2012 Michel Salim - 1.5-1 +- Update to 1.5 + * Mon Jul 25 2011 Michel Salim - 1.2-1 - Update to 1.2 From d4befe92e60bcb4c80cdfa15ed5eb7b965f2bc4f Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 27 Jan 2012 13:20:37 +0100 Subject: [PATCH 2/7] Prune dependencies --- zeroinstall-injector.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec index 95db68e..9a5a8fa 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -5,7 +5,7 @@ Name: zeroinstall-injector Version: 1.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Zero Install Injector (0launch) Group: Applications/System @@ -18,11 +18,11 @@ BuildRequires: python-devel >= 2.6 BuildRequires: desktop-file-utils BuildRequires: gettext # for-tests -BuildRequires: PyXML pygtk2 gnupg xdg-utils +BuildRequires: pygtk2 gnupg xdg-utils BuildRequires: tar gzip bzip2 xz-lzma-compat BuildRequires: python-coverage # /for-tests -Requires: PyXML pygtk2 gnupg sudo xdg-utils +Requires: pygtk2 gnupg sudo xdg-utils Requires: tar gzip bzip2 xz-lzma-compat # for PackageKit support Requires: dbus-python @@ -128,6 +128,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations %changelog +* Thu Jan 26 2012 Michel Salim - 1.5-2 +- Prune dependencies + * Thu Jan 26 2012 Michel Salim - 1.5-1 - Update to 1.5 From 0a2971d22e57957944d0059fb88e78075f1971f7 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 24 Apr 2012 11:10:26 +0700 Subject: [PATCH 3/7] Update to 1.7 --- .gitignore | 2 +- sources | 2 +- zeroinstall-injector.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a7acccd..7cf7596 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/zeroinstall-injector-1.5.tar.bz2 +/zeroinstall-injector-1.7.tar.bz2 diff --git a/sources b/sources index cbac6da..f9fc99d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1e0291183520875704386ddbc22cc5d zeroinstall-injector-1.5.tar.bz2 +23e2adf699c52f8cdfbb7ad07d6c5568 zeroinstall-injector-1.7.tar.bz2 diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec index 9a5a8fa..e9f4c3f 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -4,8 +4,8 @@ #global prerel rc1 Name: zeroinstall-injector -Version: 1.5 -Release: 2%{?dist} +Version: 1.7 +Release: 1%{?dist} Summary: The Zero Install Injector (0launch) Group: Applications/System @@ -128,6 +128,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations %changelog +* Tue Apr 24 2012 Michel Salim - 1.7-1 +- Update to 1.7 + * Thu Jan 26 2012 Michel Salim - 1.5-2 - Prune dependencies From 35b094e3cd1a9afad94622ee050914466dd7599e Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Wed, 23 May 2012 16:43:07 +0700 Subject: [PATCH 4/7] Update to 1.8 --- .gitignore | 2 +- sources | 2 +- zeroinstall-injector.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7cf7596..ff8e3f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/zeroinstall-injector-1.7.tar.bz2 +/zeroinstall-injector-1.8.tar.bz2 diff --git a/sources b/sources index f9fc99d..7e22049 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -23e2adf699c52f8cdfbb7ad07d6c5568 zeroinstall-injector-1.7.tar.bz2 +00b3e8b3cbfbe8ed55f81842a4d2c386 zeroinstall-injector-1.8.tar.bz2 diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec index e9f4c3f..afe29e2 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -4,7 +4,7 @@ #global prerel rc1 Name: zeroinstall-injector -Version: 1.7 +Version: 1.8 Release: 1%{?dist} Summary: The Zero Install Injector (0launch) @@ -128,6 +128,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations %changelog +* Wed May 23 2012 Michel Salim - 1.8-1 +- Update to 1.8 + * Tue Apr 24 2012 Michel Salim - 1.7-1 - Update to 1.7 From 92286eb272afbede04f80acd577bf264e02c1793 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 29 Jun 2012 10:17:06 +0700 Subject: [PATCH 5/7] Update to 1.9 - Remove redundant %{python_sitelib} declaration --- .gitignore | 1 + sources | 2 +- zeroinstall-injector.spec | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ff8e3f3..c96ec6b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /zeroinstall-injector-1.8.tar.bz2 +/zeroinstall-injector-1.9.tar.bz2 diff --git a/sources b/sources index 7e22049..45871ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -00b3e8b3cbfbe8ed55f81842a4d2c386 zeroinstall-injector-1.8.tar.bz2 +3c5065d147320f8953e148c6f55d89db zeroinstall-injector-1.9.tar.bz2 diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec index afe29e2..7a94ab8 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -1,10 +1,8 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - %global cache_dir /var/cache/0install.net #global prerel rc1 Name: zeroinstall-injector -Version: 1.8 +Version: 1.9 Release: 1%{?dist} Summary: The Zero Install Injector (0launch) @@ -128,6 +126,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations %changelog +* Fri Jun 29 2012 Michel Salim - 1.9-1 +- Update to 1.9 +- Remove redundant %%{python_sitelib} declaration + * Wed May 23 2012 Michel Salim - 1.8-1 - Update to 1.8 From b446df8d92eb16cc2df8397b0981f1fa2509e5df Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 7 Sep 2012 06:24:46 +0700 Subject: [PATCH 6/7] Update to 1.11 --- .gitignore | 3 +-- sources | 2 +- zeroinstall-injector.spec | 5 ++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c96ec6b..f6faae6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/zeroinstall-injector-1.8.tar.bz2 -/zeroinstall-injector-1.9.tar.bz2 +/zeroinstall-injector-1.11.tar.bz2 diff --git a/sources b/sources index 45871ea..d082a99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3c5065d147320f8953e148c6f55d89db zeroinstall-injector-1.9.tar.bz2 +20eb0497c8df9864e353411a13c41844 zeroinstall-injector-1.11.tar.bz2 diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec index 7a94ab8..408d835 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -2,7 +2,7 @@ #global prerel rc1 Name: zeroinstall-injector -Version: 1.9 +Version: 1.11 Release: 1%{?dist} Summary: The Zero Install Injector (0launch) @@ -126,6 +126,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations %changelog +* Wed Sep 5 2012 Michel Salim - 1.11-1 +- Update to 1.11 + * Fri Jun 29 2012 Michel Salim - 1.9-1 - Update to 1.9 - Remove redundant %%{python_sitelib} declaration From 93bbc2377b411075af41948e1643c08a671b468f Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 19 Nov 2012 14:20:38 +0700 Subject: [PATCH 7/7] Update to 1.13 --- .gitignore | 2 +- 0install-1.13-testDiag_explicit_cpu.patch | 31 +++++++++++++++++++++++ sources | 2 +- zeroinstall-injector.spec | 15 ++++++++--- 4 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 0install-1.13-testDiag_explicit_cpu.patch diff --git a/.gitignore b/.gitignore index f6faae6..9fbda4c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/zeroinstall-injector-1.11.tar.bz2 +/0install-1.13.tar.bz2 diff --git a/0install-1.13-testDiag_explicit_cpu.patch b/0install-1.13-testDiag_explicit_cpu.patch new file mode 100644 index 0000000..ca649f0 --- /dev/null +++ b/0install-1.13-testDiag_explicit_cpu.patch @@ -0,0 +1,31 @@ +From afb51d4969fde294fcc9846548c2950cfabf2935 Mon Sep 17 00:00:00 2001 +From: Michel Alexandre Salim +Date: Mon, 19 Nov 2012 14:00:33 +0700 +Subject: [PATCH] testsolver/testDiagnostics: set required CPU explicitly + +One of the tests (line 415) assume the host CPU to be x86_64, and does +not explicitly override the CPU field of the Requirements object. This +causes an assertion error on other architectures, as the expected error +message is only displayed if the host CPU is x86_64. + +By manually setting r.cpu = 'x86_64', the test works even on other +archs. +--- + tests/testsolver.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/testsolver.py b/tests/testsolver.py +index 3c7f78d..ceee5ee 100755 +--- a/tests/testsolver.py ++++ b/tests/testsolver.py +@@ -440,6 +440,7 @@ class TestSolver(BaseTest): + impl = self.config.iface_cache.get_feed(diag_uri).implementations['diag-5'] + r = Requirements(top_uri) + r.os = 'Windows' ++ r.cpu = 'x86_64' + self.assertEqual("There is no possible selection using Diagnostics 5.\n" + "Can't find all required implementations:\n" + "- http://localhost/diagnostics.xml -> (problem)\n" +-- +1.8.0 + diff --git a/sources b/sources index d082a99..f65e17a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -20eb0497c8df9864e353411a13c41844 zeroinstall-injector-1.11.tar.bz2 +d0332a8aab5e9f53769e1d4591df2a36 0install-1.13.tar.bz2 diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec index 408d835..82c3180 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -1,15 +1,18 @@ %global cache_dir /var/cache/0install.net +%global upstream_name 0install #global prerel rc1 Name: zeroinstall-injector -Version: 1.11 +Version: 1.13 Release: 1%{?dist} Summary: The Zero Install Injector (0launch) Group: Applications/System License: LGPLv2 URL: http://0install.net -Source0: http://downloads.sourceforge.net/project/zero-install/injector/%{version}/%{name}-%{version}.tar.bz2 +Source0: http://downloads.sf.net/project/zero-install/%{upstream_name}/%{version}/%{upstream_name}-%{version}.tar.bz2 +# https://github.com/0install/0install/pull/7 +Patch0: %{upstream_name}-1.13-testDiag_explicit_cpu.patch BuildArch: noarch BuildRequires: python-devel >= 2.6 @@ -50,7 +53,8 @@ the package is run during install or uninstall. The system can automatically check for updates when software is run. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{upstream_name}-%{version} +%patch0 -p1 -b .testDiag_explicit_cpu %build %{__python} setup.py build @@ -110,7 +114,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f zero-install.lang %defattr(-,root,root,-) -%doc COPYING README +%doc COPYING README.md %{_bindir}/0* %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/zeroinstall.menu %{_datadir}/applications/*.desktop @@ -126,6 +130,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations %changelog +* Mon Nov 19 2012 Michel Salim - 1.13-1 +- Update to 1.13 + * Wed Sep 5 2012 Michel Salim - 1.11-1 - Update to 1.11