Update to 1.13

- Remove redundant %{python_sitelib} declaration

.gitignore

@@ -1 +1 @@
-/zeroinstall-injector-1.2.tar.bz2
+/0install-1.13.tar.bz2

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@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
+

sources

@@ -1 +1 @@
-4f1cb7cb2a86f0b7d01add5991af2640  zeroinstall-injector-1.2.tar.bz2
+d0332a8aab5e9f53769e1d4591df2a36  0install-1.13.tar.bz2

zeroinstall-injector.spec

@@ -1,28 +1,29 @@
-%{!?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 upstream_name 0install
 #global prerel    rc1
 
 Name:    zeroinstall-injector
-Version: 1.2
+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
 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
@@ -52,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
@@ -112,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
@@ -128,6 +130,28 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
 
 %changelog
+* Mon Nov 19 2012 Michel Salim <salimma@fedoraproject.org> - 1.13-1
+- Update to 1.13
+
+* Wed Sep  5 2012 Michel Salim <salimma@fedoraproject.org> - 1.11-1
+- Update to 1.11
+
+* Fri Jun 29 2012 Michel Salim <salimma@fedoraproject.org> - 1.9-1
+- Update to 1.9
+- Remove redundant %%{python_sitelib} declaration
+
+* Wed May 23 2012 Michel Salim <salimma@fedoraproject.org> - 1.8-1
+- Update to 1.8
+
+* Tue Apr 24 2012 Michel Salim <salimma@fedoraproject.org> - 1.7-1
+- Update to 1.7
+
+* Thu Jan 26 2012 Michel Salim <salimma@fedoraproject.org> - 1.5-2
+- Prune dependencies
+
+* Thu Jan 26 2012 Michel Salim <salimma@fedoraproject.org> - 1.5-1
+- Update to 1.5
+
 * Mon Jul 25 2011 Michel Salim <salimma@fedoraproject.org> - 1.2-1
 - Update to 1.2