[zeroinstall-injector/f17] Update to 1.13

[Michel Alexandre Salim]

commit 9521fd0b46bea56f9553e7959bb124386fc97410
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Mon Nov 19 14:20:38 2012 +0700

    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(-)
---
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 <salimma at fedoraproject.org>
+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 2bd0e67..438f95c 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 <salimma at fedoraproject.org> - 1.13-1
+- Update to 1.13
+
 * Wed Sep  5 2012 Michel Salim <salimma at fedoraproject.org> - 1.11-1
 - Update to 1.11