Update to 2.3.3

(cherry picked from commit c9683791e3)

.gitignore

@@ -1 +1 @@
-/0install-1.13.tar.bz2
+/0install-2.3.3.tar.bz2

0install-1.13-testDiag_explicit_cpu.patch

@@ -1,31 +0,0 @@
-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 @@
-d0332a8aab5e9f53769e1d4591df2a36  0install-1.13.tar.bz2
+00d567d9086d0b030ac610df6e4cb237  0install-2.3.3.tar.bz2

zeroinstall-injector.spec

@@ -3,7 +3,7 @@
 #global prerel    rc1
 
 Name:    zeroinstall-injector
-Version: 1.13
+Version: 2.3.3
 Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
@@ -11,8 +11,6 @@ Group:   Applications/System
 License: LGPLv2
 URL:     http://0install.net
 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
@@ -54,7 +52,6 @@ automatically check for updates when software is run.
 
 %prep
 %setup -q -n %{upstream_name}-%{version}
-%patch0 -p1 -b .testDiag_explicit_cpu
 
 %build
 %{__python} setup.py build
@@ -65,16 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 mv "$RPM_BUILD_ROOT/usr/man" "$RPM_BUILD_ROOT/%{_datadir}/man"
 mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations"
 
-for i in add manage; do
-  desktop-file-install \
-%if 0%{!?fedora:1}
-    --vendor="" \
-%endif
-    --add-category="System" \
-    --delete-original \
-    --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-    $RPM_BUILD_ROOT%{_datadir}/applications/zeroinstall-$i.desktop
-done
+desktop-file-validate \
+    $RPM_BUILD_ROOT%{_datadir}/applications/0install.desktop
+
 %find_lang zero-install
 
 %check
@@ -116,9 +106,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %defattr(-,root,root,-)
 %doc COPYING README.md
 %{_bindir}/0*
-%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/zeroinstall.menu
 %{_datadir}/applications/*.desktop
-%{_datadir}/desktop-directories/zeroinstall.directory
 %{_datadir}/icons/hicolor/*/apps/zeroinstall.png
 %{_datadir}/icons/hicolor/scalable/apps/zeroinstall.svg
 %{python_sitelib}/zeroinstall/
@@ -128,8 +116,36 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man1/0*
 %dir %{cache_dir}
 %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/0install
+%dir %{_datadir}/fish
+%dir %{_datadir}/fish/completions
+%{_datadir}/fish/completions/0install.fish
+%dir %{_datadir}/zsh
+%dir %{_datadir}/zsh/site-functions
+%{_datadir}/zsh/site-functions/_0install
+
 
 %changelog
+* Wed Aug 14 2013 Michel Salim <salimma@fedoraproject.org> - 2.3.3-1
+- Update to 2.3.3
+
+* Fri Jul  5 2013 Michel Salim <salimma@fedoraproject.org> - 2.3-1
+- Update to 2.3
+
+* Mon May  6 2013 Michel Salim <salimma@fedoraproject.org> - 2.2-1
+- Update to 2.2
+
+* Fri Apr  5 2013 Michel Salim <salimma@fedoraproject.org> - 2.1-1
+- Update to 2.1
+
+* Wed Mar  6 2013 Michel Salim <salimma@fedoraproject.org> - 2.0-1
+- Update to 2.0
+
+* Mon Feb 25 2013 Michel Salim <salimma@fedoraproject.org> - 1.16-1
+- Update to 1.16
+
 * Mon Nov 19 2012 Michel Salim <salimma@fedoraproject.org> - 1.13-1
 - Update to 1.13
 
@@ -250,7 +266,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 * Sat Feb 25 2006 Michel Salim <michel.salim@gmail.com> 0.18-3
 - Add Python-related requirements, BuildReq on gnupg to decrypt upstream source
- 
+
 * Sat Feb 18 2006 Michel Salim <michel.salim@gmail.com> 0.18-2
 - Use _mandir, discard CFLAGS and unused python_sitearch definition