From 7260416fe36db857bb24221702d33489de49a225 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Wed, 17 Feb 2010 03:35:46 +0000
Subject: [PATCH 01/50] 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 <salimma@fedoraproject.org>
Date: Fri, 9 Jul 2010 10:32:18 +0000
Subject: [PATCH 02/50] - 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 <salimma@fedoraproject.org> - 0.49-1
+- Update to 0.49
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 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 <salimma@fedoraproject.org>
Date: Fri, 9 Jul 2010 11:06:27 +0000
Subject: [PATCH 03/50] 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 <salimma@fedoraproject.org>
Date: Fri, 9 Jul 2010 15:23:04 +0000
Subject: [PATCH 04/50] - 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 <salimma@fedoraproject.org> - 0.49-2
+- Enable tests
+
 * Fri Jul  9 2010 Michel Salim <salimma@fedoraproject.org> - 0.49-1
 - Update to 0.49
 

From e15d6aac99be551e907ef2543ffc6065b939cefe Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Fri, 9 Jul 2010 15:52:36 +0000
Subject: [PATCH 05/50] 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 <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 16:28:59 +0000
Subject: [PATCH 06/50] 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

From f77a7becf84961223b330d764a26f354da1255b1 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <michel.salim@cs.fau.de>
Date: Tue, 14 Jun 2011 10:15:32 +0200
Subject: [PATCH 07/50] Update to 1.0

---
 .gitignore                |  3 +--
 sources                   |  2 +-
 zeroinstall-injector.spec | 11 +++++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index e6a53a9..498d86d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/zeroinstall-injector-0.53.tar.bz2
-/zeroinstall-injector-1.0-rc1.tar.bz2
+/zeroinstall-injector-1.0.tar.bz2
diff --git a/sources b/sources
index 144a32b..0ae10c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e16f7d71731a283cb899664dd91af57b  zeroinstall-injector-1.0-rc1.tar.bz2
+6b3864376e8846d6bd0b4180faa11b40  zeroinstall-injector-1.0.tar.bz2
diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 03d2b5c..369c387 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -1,17 +1,17 @@
 %{!?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
+#global prerel    rc1
 
 Name:    zeroinstall-injector
 Version: 1.0
-Release: 0.%{prerel}.1%{?dist}
+Release: 1%{?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}-%{prerel}.tar.bz2
+Source0: http://downloads.sourceforge.net/project/zero-install/injector/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -53,7 +53,7 @@ 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}-%{prerel}
+%setup -q -n %{name}-%{version}
 #patch0 -p1 -b .any-arch
 
 %build
@@ -129,6 +129,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
 
 %changelog
+* Tue Jun 14 2011 Michel Salim <salimma@fedoraproject.org> - 1.0-1
+- Update to 1.0
+
 * Tue May  3 2011 Michel Salim <salimma@fedoraproject.org> - 1.0-0.rc1.1
 - Update to 1.0rc1
 

From a10208afe0b68a9046e7f35537c2c253865d6a4d Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <michel.salim@cs.fau.de>
Date: Wed, 15 Jun 2011 13:06:53 +0200
Subject: [PATCH 08/50] Add main category "System" to desktop entries

---
 zeroinstall-injector.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 369c387..796bc8e 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -5,7 +5,7 @@
 
 Name:    zeroinstall-injector
 Version: 1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -70,7 +70,7 @@ for i in add manage; do
 %if 0%{!?fedora:1}
     --vendor="" \
 %endif
-    --remove-category="Application" \
+    --add-category="System" \
     --delete-original \
     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
     $RPM_BUILD_ROOT%{_datadir}/applications/zeroinstall-$i.desktop
@@ -129,6 +129,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
 
 %changelog
+* Wed Jun 15 2011 Michel Salim <salimma@fedoraproject.org> - 1.0-2
+- Add main category "System" to desktop entries
+
 * Tue Jun 14 2011 Michel Salim <salimma@fedoraproject.org> - 1.0-1
 - Update to 1.0
 

From 9527bba711e94d1c669a762206e5e96651710e4e Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <michel.salim@cs.fau.de>
Date: Wed, 22 Jun 2011 15:17:16 +0200
Subject: [PATCH 09/50] Fix --versions handling of 0alias-generated launchers

---
 zeroinstall-injector-1.0-fix-versions.patch | 31 +++++++++++++++++++++
 zeroinstall-injector.spec                   | 10 +++++--
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 zeroinstall-injector-1.0-fix-versions.patch

diff --git a/zeroinstall-injector-1.0-fix-versions.patch b/zeroinstall-injector-1.0-fix-versions.patch
new file mode 100644
index 0000000..b3a25df
--- /dev/null
+++ b/zeroinstall-injector-1.0-fix-versions.patch
@@ -0,0 +1,31 @@
+--- zeroinstall-injector-1.0/zeroinstall/alias.py.fix-versions	2011-05-23 10:10:43.000000000 +0200
++++ zeroinstall-injector-1.0/zeroinstall/alias.py	2011-06-22 14:46:56.457683015 +0200
+@@ -10,7 +10,7 @@
+ 
+ _template = '''#!/bin/sh
+ if [ "$*" = "--versions" ]; then
+-  exec 0launch -gd '%s' "$@"
++  exec 0launch -gd '%s'
+ else
+   exec 0launch %s '%s' "$@"
+ fi
+--- zeroinstall-injector-1.0/tests/testalias.py.fix-versions	2011-05-23 10:10:43.000000000 +0200
++++ zeroinstall-injector-1.0/tests/testalias.py	2011-06-22 14:58:48.609768005 +0200
+@@ -10,7 +10,7 @@
+ 
+ expected_script = """#!/bin/sh
+ if [ "$*" = "--versions" ]; then
+-  exec 0launch -gd 'http://example.com/foo.xml' "$@"
++  exec 0launch -gd 'http://example.com/foo.xml'
+ else
+   exec 0launch  'http://example.com/foo.xml' "$@"
+ fi
+@@ -18,7 +18,7 @@
+ 
+ expected_script_main = """#!/bin/sh
+ if [ "$*" = "--versions" ]; then
+-  exec 0launch -gd 'http://example.com/foo.xml' "$@"
++  exec 0launch -gd 'http://example.com/foo.xml'
+ else
+   exec 0launch --main 'a'\\'''\\''\\test' 'http://example.com/foo.xml' "$@"
+ fi
diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 796bc8e..532bc37 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -5,13 +5,15 @@
 
 Name:    zeroinstall-injector
 Version: 1.0
-Release: 2%{?dist}
+Release: 3%{?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
+# https://sourceforge.net/tracker/?func=detail&aid=3324502&group_id=76468&atid=547191
+Patch0:	 %{name}-1.0-fix-versions.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -54,7 +56,8 @@ automatically check for updates when software is run.
 
 %prep
 %setup -q -n %{name}-%{version}
-#patch0 -p1 -b .any-arch
+
+%patch0 -p1 -b .fix-versions
 
 %build
 %{__python} setup.py build
@@ -129,6 +132,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
 
 %changelog
+* Wed Jun 22 2011 Michel Salim <salimma@fedoraproject.org> - 1.0-3
+- Fix --versions handling of 0alias-generated launchers
+
 * Wed Jun 15 2011 Michel Salim <salimma@fedoraproject.org> - 1.0-2
 - Add main category "System" to desktop entries
 

From 73ec6b19bba84c16ed66f22ed376f588b146e1b8 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <michel.salim@cs.fau.de>
Date: Wed, 29 Jun 2011 14:30:38 +0200
Subject: [PATCH 10/50] Update to 1.1 Remove --versions option, obsoleted in
 favor of '0alias launcher'

---
 .gitignore                                  |  2 +-
 sources                                     |  2 +-
 zeroinstall-injector-1.0-fix-versions.patch | 31 ------------
 zeroinstall-injector-1.1-rm-versions.patch  | 56 +++++++++++++++++++++
 zeroinstall-injector.spec                   | 14 ++++--
 5 files changed, 67 insertions(+), 38 deletions(-)
 delete mode 100644 zeroinstall-injector-1.0-fix-versions.patch
 create mode 100644 zeroinstall-injector-1.1-rm-versions.patch

diff --git a/.gitignore b/.gitignore
index 498d86d..fd4d3d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/zeroinstall-injector-1.0.tar.bz2
+/zeroinstall-injector-1.1.tar.bz2
diff --git a/sources b/sources
index 0ae10c2..3eaee65 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6b3864376e8846d6bd0b4180faa11b40  zeroinstall-injector-1.0.tar.bz2
+c36310465a164ce5592776a8d7136ad7  zeroinstall-injector-1.1.tar.bz2
diff --git a/zeroinstall-injector-1.0-fix-versions.patch b/zeroinstall-injector-1.0-fix-versions.patch
deleted file mode 100644
index b3a25df..0000000
--- a/zeroinstall-injector-1.0-fix-versions.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- zeroinstall-injector-1.0/zeroinstall/alias.py.fix-versions	2011-05-23 10:10:43.000000000 +0200
-+++ zeroinstall-injector-1.0/zeroinstall/alias.py	2011-06-22 14:46:56.457683015 +0200
-@@ -10,7 +10,7 @@
- 
- _template = '''#!/bin/sh
- if [ "$*" = "--versions" ]; then
--  exec 0launch -gd '%s' "$@"
-+  exec 0launch -gd '%s'
- else
-   exec 0launch %s '%s' "$@"
- fi
---- zeroinstall-injector-1.0/tests/testalias.py.fix-versions	2011-05-23 10:10:43.000000000 +0200
-+++ zeroinstall-injector-1.0/tests/testalias.py	2011-06-22 14:58:48.609768005 +0200
-@@ -10,7 +10,7 @@
- 
- expected_script = """#!/bin/sh
- if [ "$*" = "--versions" ]; then
--  exec 0launch -gd 'http://example.com/foo.xml' "$@"
-+  exec 0launch -gd 'http://example.com/foo.xml'
- else
-   exec 0launch  'http://example.com/foo.xml' "$@"
- fi
-@@ -18,7 +18,7 @@
- 
- expected_script_main = """#!/bin/sh
- if [ "$*" = "--versions" ]; then
--  exec 0launch -gd 'http://example.com/foo.xml' "$@"
-+  exec 0launch -gd 'http://example.com/foo.xml'
- else
-   exec 0launch --main 'a'\\'''\\''\\test' 'http://example.com/foo.xml' "$@"
- fi
diff --git a/zeroinstall-injector-1.1-rm-versions.patch b/zeroinstall-injector-1.1-rm-versions.patch
new file mode 100644
index 0000000..4359476
--- /dev/null
+++ b/zeroinstall-injector-1.1-rm-versions.patch
@@ -0,0 +1,56 @@
+--- zeroinstall-injector-1.1/zeroinstall/alias.py.rm-versions	2011-06-25 16:31:12.000000000 +0200
++++ zeroinstall-injector-1.1/zeroinstall/alias.py	2011-06-29 14:26:06.464268155 +0200
+@@ -8,7 +8,7 @@
+ 
+ from zeroinstall import _
+ 
+-_template = '''#!/bin/sh
++_old_template = '''#!/bin/sh
+ if [ "$*" = "--versions" ]; then
+   exec 0launch -gd '%s' "$@"
+ else
+@@ -16,6 +16,10 @@
+ fi
+ ''' 
+ 
++_template = '''#!/bin/sh
++exec 0launch %s '%s' "$@"
++'''
++
+ class NotAnAliasScript(Exception):
+ 	pass
+ 
+@@ -27,12 +31,22 @@
+ 	@raise NotAnAliasScript: if we can't parse the script
+ 	"""
+ 	stream = file(pathname)
+-	template_header = _template[:_template.index("-gd '")]
++	template_header = _template[:_template.index("%s '")]
+ 	actual_header = stream.read(len(template_header))
+-	if template_header != actual_header:
+-		raise NotAnAliasScript(_("'%s' does not look like a script created by 0alias") % pathname)
+-	rest = stream.read()	# If it's a 0alias script, it should be quite short!
+-	line = rest.split('\n')[2]
++	stream.seek(0)
++	if template_header == actual_header:
++		# If it's a 0alias script, it should be quite short!		
++		rest = stream.read()
++		line = rest.split('\n')[1]
++	else:
++		old_template_header = \
++		    _old_template[:_old_template.index("-gd '")]
++		actual_header = stream.read(len(old_template_header))
++		if old_template_header != actual_header:
++			raise NotAnAliasScript(_("'%s' does not look like a script created by 0alias") % pathname)
++		rest = stream.read()	
++		line = rest.split('\n')[2]
++
+ 	split = line.rfind("' '")
+ 	if split != -1:
+ 		# We have a --main
+@@ -57,4 +71,4 @@
+ 	else:
+ 		main_arg = ""
+ 
+-	stream.write(_template % (interface_uri, main_arg, interface_uri))
++	stream.write(_template % (main_arg, interface_uri))
diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 532bc37..4dc3df1 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -4,8 +4,8 @@
 #global prerel    rc1
 
 Name:    zeroinstall-injector
-Version: 1.0
-Release: 3%{?dist}
+Version: 1.1
+Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -13,11 +13,11 @@ License: LGPLv2
 URL:     http://0install.net
 Source0: http://downloads.sourceforge.net/project/zero-install/injector/%{version}/%{name}-%{version}.tar.bz2
 # https://sourceforge.net/tracker/?func=detail&aid=3324502&group_id=76468&atid=547191
-Patch0:	 %{name}-1.0-fix-versions.patch
+Patch0:	 %{name}-1.1-rm-versions.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
-BuildRequires: python-devel
+BuildRequires: python-devel >= 2.6
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 # for-tests
@@ -57,7 +57,7 @@ automatically check for updates when software is run.
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch0 -p1 -b .fix-versions
+%patch0 -p1 -b .rm-versions
 
 %build
 %{__python} setup.py build
@@ -132,6 +132,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
 
 %changelog
+* Wed Jun 29 2011 Michel Salim <salimma@fedoraproject.org> - 1.1-1
+- Update to 1.1
+- Remove --versions option, obsoleted in favor of '0alias launcher'
+
 * Wed Jun 22 2011 Michel Salim <salimma@fedoraproject.org> - 1.0-3
 - Fix --versions handling of 0alias-generated launchers
 

From 5662d1590156629b2704ba3945a763b53a5f5587 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <michel.salim@cs.fau.de>
Date: Wed, 29 Jun 2011 14:38:53 +0200
Subject: [PATCH 11/50] also update testsuite

---
 zeroinstall-injector-1.1-rm-versions.patch | 59 +++++++++++++++++++---
 1 file changed, 53 insertions(+), 6 deletions(-)

diff --git a/zeroinstall-injector-1.1-rm-versions.patch b/zeroinstall-injector-1.1-rm-versions.patch
index 4359476..7d37b41 100644
--- a/zeroinstall-injector-1.1-rm-versions.patch
+++ b/zeroinstall-injector-1.1-rm-versions.patch
@@ -1,6 +1,50 @@
---- zeroinstall-injector-1.1/zeroinstall/alias.py.rm-versions	2011-06-25 16:31:12.000000000 +0200
-+++ zeroinstall-injector-1.1/zeroinstall/alias.py	2011-06-29 14:26:06.464268155 +0200
-@@ -8,7 +8,7 @@
+From 4eb8b95718db10d8bf6024ad5aeea19ce1f777d3 Mon Sep 17 00:00:00 2001
+From: Michel Alexandre Salim <salimma@fedoraproject.org>
+Date: Wed, 29 Jun 2011 14:31:45 +0200
+Subject: [PATCH] 0alias: new-style launcher scripts
+
+alias.py:
+- generate new-style launcher script without --versions handling
+- modify detection code to detect both variants of launcher scripts
+
+testalias.py:
+- updated to match new launcher script template
+---
+ tests/testalias.py   |   12 ++----------
+ zeroinstall/alias.py |   28 +++++++++++++++++++++-------
+ 2 files changed, 23 insertions(+), 17 deletions(-)
+
+diff --git a/tests/testalias.py b/tests/testalias.py
+index a96aea4..7934c96 100755
+--- a/tests/testalias.py
++++ b/tests/testalias.py
+@@ -9,19 +9,11 @@ sys.path.insert(0, '..')
+ from zeroinstall import alias
+ 
+ expected_script = """#!/bin/sh
+-if [ "$*" = "--versions" ]; then
+-  exec 0launch -gd 'http://example.com/foo.xml' "$@"
+-else
+-  exec 0launch  'http://example.com/foo.xml' "$@"
+-fi
++exec 0launch  'http://example.com/foo.xml' "$@"
+ """
+ 
+ expected_script_main = """#!/bin/sh
+-if [ "$*" = "--versions" ]; then
+-  exec 0launch -gd 'http://example.com/foo.xml' "$@"
+-else
+-  exec 0launch --main 'a'\\'''\\''\\test' 'http://example.com/foo.xml' "$@"
+-fi
++exec 0launch --main 'a'\\'''\\''\\test' 'http://example.com/foo.xml' "$@"
+ """
+ 
+ class TestAlias(BaseTest):
+diff --git a/zeroinstall/alias.py b/zeroinstall/alias.py
+index a7189ab..9b9fa89 100644
+--- a/zeroinstall/alias.py
++++ b/zeroinstall/alias.py
+@@ -8,7 +8,7 @@ Support code for 0alias scripts.
  
  from zeroinstall import _
  
@@ -9,7 +53,7 @@
  if [ "$*" = "--versions" ]; then
    exec 0launch -gd '%s' "$@"
  else
-@@ -16,6 +16,10 @@
+@@ -16,6 +16,10 @@ else
  fi
  ''' 
  
@@ -20,7 +64,7 @@
  class NotAnAliasScript(Exception):
  	pass
  
-@@ -27,12 +31,22 @@
+@@ -27,12 +31,22 @@ def parse_script(pathname):
  	@raise NotAnAliasScript: if we can't parse the script
  	"""
  	stream = file(pathname)
@@ -48,9 +92,12 @@
  	split = line.rfind("' '")
  	if split != -1:
  		# We have a --main
-@@ -57,4 +71,4 @@
+@@ -57,4 +71,4 @@ def write_script(stream, interface_uri, main = None):
  	else:
  		main_arg = ""
  
 -	stream.write(_template % (interface_uri, main_arg, interface_uri))
 +	stream.write(_template % (main_arg, interface_uri))
+-- 
+1.7.5.4
+

From c377dbcc934c4d11584443df2a4491e4fbb621ca Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <michel.salim@cs.fau.de>
Date: Wed, 29 Jun 2011 15:01:21 +0200
Subject: [PATCH 12/50] updated patch, also tests parsing of old launcher
 scripts

---
 zeroinstall-injector-1.1-rm-versions.patch | 65 +++++++++++++++-------
 1 file changed, 46 insertions(+), 19 deletions(-)

diff --git a/zeroinstall-injector-1.1-rm-versions.patch b/zeroinstall-injector-1.1-rm-versions.patch
index 7d37b41..6f1ae0c 100644
--- a/zeroinstall-injector-1.1-rm-versions.patch
+++ b/zeroinstall-injector-1.1-rm-versions.patch
@@ -1,4 +1,4 @@
-From 4eb8b95718db10d8bf6024ad5aeea19ce1f777d3 Mon Sep 17 00:00:00 2001
+From 6cd13b5b860c4edc615f111017fac614e28d9fed Mon Sep 17 00:00:00 2001
 From: Michel Alexandre Salim <salimma@fedoraproject.org>
 Date: Wed, 29 Jun 2011 14:31:45 +0200
 Subject: [PATCH] 0alias: new-style launcher scripts
@@ -9,37 +9,64 @@ alias.py:
 
 testalias.py:
 - updated to match new launcher script template
+- also test parsing of old-style launcher scripts
 ---
- tests/testalias.py   |   12 ++----------
+ tests/testalias.py   |   27 ++++++++++++++++++++++++++-
  zeroinstall/alias.py |   28 +++++++++++++++++++++-------
- 2 files changed, 23 insertions(+), 17 deletions(-)
+ 2 files changed, 47 insertions(+), 8 deletions(-)
 
 diff --git a/tests/testalias.py b/tests/testalias.py
-index a96aea4..7934c96 100755
+index a96aea4..43863a8 100755
 --- a/tests/testalias.py
 +++ b/tests/testalias.py
-@@ -9,19 +9,11 @@ sys.path.insert(0, '..')
+@@ -9,14 +9,22 @@ sys.path.insert(0, '..')
  from zeroinstall import alias
  
  expected_script = """#!/bin/sh
--if [ "$*" = "--versions" ]; then
--  exec 0launch -gd 'http://example.com/foo.xml' "$@"
--else
--  exec 0launch  'http://example.com/foo.xml' "$@"
--fi
 +exec 0launch  'http://example.com/foo.xml' "$@"
- """
- 
- expected_script_main = """#!/bin/sh
--if [ "$*" = "--versions" ]; then
--  exec 0launch -gd 'http://example.com/foo.xml' "$@"
--else
--  exec 0launch --main 'a'\\'''\\''\\test' 'http://example.com/foo.xml' "$@"
--fi
++"""
++
++old_script = """#!/bin/sh
+ if [ "$*" = "--versions" ]; then
+   exec 0launch -gd 'http://example.com/foo.xml' "$@"
+ else
+   exec 0launch  'http://example.com/foo.xml' "$@"
+ fi
++ """
++ 
++expected_script_main = """#!/bin/sh
 +exec 0launch --main 'a'\\'''\\''\\test' 'http://example.com/foo.xml' "$@"
  """
  
- class TestAlias(BaseTest):
+-expected_script_main = """#!/bin/sh
++old_script_main = """#!/bin/sh
+ if [ "$*" = "--versions" ]; then
+   exec 0launch -gd 'http://example.com/foo.xml' "$@"
+ else
+@@ -53,6 +61,23 @@ class TestAlias(BaseTest):
+ 		uri, main = alias.parse_script(tmp.name)
+ 		self.assertEquals('http://example.com/foo.xml', uri)
+ 		self.assertEquals('a\'\'\\test', main)
++
++	def testParseOld(self):
++		tmp = tempfile.NamedTemporaryFile()
++		tmp.write(old_script)
++		tmp.flush()
++		tmp.seek(0)
++		uri, main = alias.parse_script(tmp.name)
++		self.assertEquals('http://example.com/foo.xml', uri)
++		self.assertEquals(None, main)
++
++		tmp = tempfile.NamedTemporaryFile()
++		tmp.write(old_script_main)
++		tmp.flush()
++		tmp.seek(0)
++		uri, main = alias.parse_script(tmp.name)
++		self.assertEquals('http://example.com/foo.xml', uri)
++		self.assertEquals('a\'\'\\test', main)
+ 	
+ 	def testParseException(self):
+ 		tmp = tempfile.NamedTemporaryFile()
 diff --git a/zeroinstall/alias.py b/zeroinstall/alias.py
 index a7189ab..9b9fa89 100644
 --- a/zeroinstall/alias.py

From d9bd7dc958c74bf8665a69e97c20ec2333336a9b Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <michel.salim@cs.fau.de>
Date: Sat, 2 Jul 2011 22:42:06 +0200
Subject: [PATCH 13/50] Further launcher script clean-up

---
 zeroinstall-injector-1.1-rm-space.patch | 57 +++++++++++++++++++++++++
 zeroinstall-injector.spec               | 11 +++--
 2 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 zeroinstall-injector-1.1-rm-space.patch

diff --git a/zeroinstall-injector-1.1-rm-space.patch b/zeroinstall-injector-1.1-rm-space.patch
new file mode 100644
index 0000000..e5ad5de
--- /dev/null
+++ b/zeroinstall-injector-1.1-rm-space.patch
@@ -0,0 +1,57 @@
+From 9269f43875d9a58601976626f17cb488dd2f6fb5 Mon Sep 17 00:00:00 2001
+From: Thomas Leonard <talex5@gmail.com>
+Date: Sat, 2 Jul 2011 10:49:29 +0100
+Subject: [PATCH] Removed extra space from alias scripts
+
+---
+ tests/testalias.py   |    2 +-
+ zeroinstall/alias.py |    6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/testalias.py b/tests/testalias.py
+index 0618f9b..a2d4366 100755
+--- a/tests/testalias.py
++++ b/tests/testalias.py
+@@ -9,7 +9,7 @@ sys.path.insert(0, '..')
+ from zeroinstall import alias
+ 
+ expected_script = """#!/bin/sh
+-exec 0launch  'http://example.com/foo.xml' "$@"
++exec 0launch 'http://example.com/foo.xml' "$@"
+ """
+ 
+ old_script = """#!/bin/sh
+diff --git a/zeroinstall/alias.py b/zeroinstall/alias.py
+index a6fb6dd..f46b59c 100644
+--- a/zeroinstall/alias.py
++++ b/zeroinstall/alias.py
+@@ -17,7 +17,7 @@ fi
+ ''' 
+ 
+ _template = '''#!/bin/sh
+-exec 0launch %s '%s' "$@"
++exec 0launch %s'%s' "$@"
+ '''
+ 
+ class NotAnAliasScript(Exception):
+@@ -31,7 +31,7 @@ def parse_script(pathname):
+ 	@raise NotAnAliasScript: if we can't parse the script
+ 	"""
+ 	stream = file(pathname)
+-	template_header = _template[:_template.index("%s '")]
++	template_header = _template[:_template.index("%s'")]
+ 	actual_header = stream.read(len(template_header))
+ 	stream.seek(0)
+ 	if template_header == actual_header:
+@@ -67,7 +67,7 @@ def write_script(stream, interface_uri, main = None):
+ 	assert "\\" not in interface_uri
+ 
+ 	if main is not None:
+-		main_arg = "--main '%s'" % main.replace("'", "'\\''")
++		main_arg = "--main '%s' " % main.replace("'", "'\\''")
+ 	else:
+ 		main_arg = ""
+ 
+-- 
+1.7.5.4
+
diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 4dc3df1..fc5b056 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -5,15 +5,16 @@
 
 Name:    zeroinstall-injector
 Version: 1.1
-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/project/zero-install/injector/%{version}/%{name}-%{version}.tar.bz2
-# https://sourceforge.net/tracker/?func=detail&aid=3324502&group_id=76468&atid=547191
-Patch0:	 %{name}-1.1-rm-versions.patch
+# From post-1.1 Git master branch
+Patch0:  %{name}-1.1-rm-versions.patch
+Patch1:  %{name}-1.1-rm-space.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -58,6 +59,7 @@ automatically check for updates when software is run.
 %setup -q -n %{name}-%{version}
 
 %patch0 -p1 -b .rm-versions
+%patch1 -p1 -b .rm-space
 
 %build
 %{__python} setup.py build
@@ -132,6 +134,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
 
 %changelog
+* Sat Jul  2 2011 Michel Salim <salimma@fedoraproject.org> - 1.1-2
+- Further launcher script clean-up
+
 * Wed Jun 29 2011 Michel Salim <salimma@fedoraproject.org> - 1.1-1
 - Update to 1.1
 - Remove --versions option, obsoleted in favor of '0alias launcher'

From 19bfa20fed9eb35563899cf276161dea21353602 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Mon, 25 Jul 2011 20:07:08 +0200
Subject: [PATCH 14/50] Update to 1.2

---
 .gitignore                |  2 +-
 sources                   |  2 +-
 zeroinstall-injector.spec | 15 ++++++---------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index fd4d3d6..f18ab91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/zeroinstall-injector-1.1.tar.bz2
+/zeroinstall-injector-1.2.tar.bz2
diff --git a/sources b/sources
index 3eaee65..329c616 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c36310465a164ce5592776a8d7136ad7  zeroinstall-injector-1.1.tar.bz2
+4f1cb7cb2a86f0b7d01add5991af2640  zeroinstall-injector-1.2.tar.bz2
diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index fc5b056..32055b3 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -4,18 +4,14 @@
 #global prerel    rc1
 
 Name:    zeroinstall-injector
-Version: 1.1
-Release: 2%{?dist}
+Version: 1.2
+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
-# From post-1.1 Git master branch
-Patch0:  %{name}-1.1-rm-versions.patch
-Patch1:  %{name}-1.1-rm-space.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 BuildRequires: python-devel >= 2.6
@@ -58,9 +54,6 @@ automatically check for updates when software is run.
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch0 -p1 -b .rm-versions
-%patch1 -p1 -b .rm-space
-
 %build
 %{__python} setup.py build
 
@@ -83,6 +76,7 @@ done
 %find_lang zero-install
 
 %check
+export PYTHONPATH=`pwd`
 cd tests
 for t in download packagekit; do
   mv test${t}.py{,.off}
@@ -134,6 +128,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
 
 %changelog
+* Mon Jul 25 2011 Michel Salim <salimma@fedoraproject.org> - 1.2-1
+- Update to 1.2
+
 * Sat Jul  2 2011 Michel Salim <salimma@fedoraproject.org> - 1.1-2
 - Further launcher script clean-up
 

From c734330ef994ebc87079359b819066a3d431fe0e Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Mon, 25 Jul 2011 20:18:06 +0200
Subject: [PATCH 15/50] remove obsoleted patches

---
 zeroinstall-injector-1.1-rm-space.patch    |  57 ---------
 zeroinstall-injector-1.1-rm-versions.patch | 130 ---------------------
 2 files changed, 187 deletions(-)
 delete mode 100644 zeroinstall-injector-1.1-rm-space.patch
 delete mode 100644 zeroinstall-injector-1.1-rm-versions.patch

diff --git a/zeroinstall-injector-1.1-rm-space.patch b/zeroinstall-injector-1.1-rm-space.patch
deleted file mode 100644
index e5ad5de..0000000
--- a/zeroinstall-injector-1.1-rm-space.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9269f43875d9a58601976626f17cb488dd2f6fb5 Mon Sep 17 00:00:00 2001
-From: Thomas Leonard <talex5@gmail.com>
-Date: Sat, 2 Jul 2011 10:49:29 +0100
-Subject: [PATCH] Removed extra space from alias scripts
-
----
- tests/testalias.py   |    2 +-
- zeroinstall/alias.py |    6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/testalias.py b/tests/testalias.py
-index 0618f9b..a2d4366 100755
---- a/tests/testalias.py
-+++ b/tests/testalias.py
-@@ -9,7 +9,7 @@ sys.path.insert(0, '..')
- from zeroinstall import alias
- 
- expected_script = """#!/bin/sh
--exec 0launch  'http://example.com/foo.xml' "$@"
-+exec 0launch 'http://example.com/foo.xml' "$@"
- """
- 
- old_script = """#!/bin/sh
-diff --git a/zeroinstall/alias.py b/zeroinstall/alias.py
-index a6fb6dd..f46b59c 100644
---- a/zeroinstall/alias.py
-+++ b/zeroinstall/alias.py
-@@ -17,7 +17,7 @@ fi
- ''' 
- 
- _template = '''#!/bin/sh
--exec 0launch %s '%s' "$@"
-+exec 0launch %s'%s' "$@"
- '''
- 
- class NotAnAliasScript(Exception):
-@@ -31,7 +31,7 @@ def parse_script(pathname):
- 	@raise NotAnAliasScript: if we can't parse the script
- 	"""
- 	stream = file(pathname)
--	template_header = _template[:_template.index("%s '")]
-+	template_header = _template[:_template.index("%s'")]
- 	actual_header = stream.read(len(template_header))
- 	stream.seek(0)
- 	if template_header == actual_header:
-@@ -67,7 +67,7 @@ def write_script(stream, interface_uri, main = None):
- 	assert "\\" not in interface_uri
- 
- 	if main is not None:
--		main_arg = "--main '%s'" % main.replace("'", "'\\''")
-+		main_arg = "--main '%s' " % main.replace("'", "'\\''")
- 	else:
- 		main_arg = ""
- 
--- 
-1.7.5.4
-
diff --git a/zeroinstall-injector-1.1-rm-versions.patch b/zeroinstall-injector-1.1-rm-versions.patch
deleted file mode 100644
index 6f1ae0c..0000000
--- a/zeroinstall-injector-1.1-rm-versions.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 6cd13b5b860c4edc615f111017fac614e28d9fed Mon Sep 17 00:00:00 2001
-From: Michel Alexandre Salim <salimma@fedoraproject.org>
-Date: Wed, 29 Jun 2011 14:31:45 +0200
-Subject: [PATCH] 0alias: new-style launcher scripts
-
-alias.py:
-- generate new-style launcher script without --versions handling
-- modify detection code to detect both variants of launcher scripts
-
-testalias.py:
-- updated to match new launcher script template
-- also test parsing of old-style launcher scripts
----
- tests/testalias.py   |   27 ++++++++++++++++++++++++++-
- zeroinstall/alias.py |   28 +++++++++++++++++++++-------
- 2 files changed, 47 insertions(+), 8 deletions(-)
-
-diff --git a/tests/testalias.py b/tests/testalias.py
-index a96aea4..43863a8 100755
---- a/tests/testalias.py
-+++ b/tests/testalias.py
-@@ -9,14 +9,22 @@ sys.path.insert(0, '..')
- from zeroinstall import alias
- 
- expected_script = """#!/bin/sh
-+exec 0launch  'http://example.com/foo.xml' "$@"
-+"""
-+
-+old_script = """#!/bin/sh
- if [ "$*" = "--versions" ]; then
-   exec 0launch -gd 'http://example.com/foo.xml' "$@"
- else
-   exec 0launch  'http://example.com/foo.xml' "$@"
- fi
-+ """
-+ 
-+expected_script_main = """#!/bin/sh
-+exec 0launch --main 'a'\\'''\\''\\test' 'http://example.com/foo.xml' "$@"
- """
- 
--expected_script_main = """#!/bin/sh
-+old_script_main = """#!/bin/sh
- if [ "$*" = "--versions" ]; then
-   exec 0launch -gd 'http://example.com/foo.xml' "$@"
- else
-@@ -53,6 +61,23 @@ class TestAlias(BaseTest):
- 		uri, main = alias.parse_script(tmp.name)
- 		self.assertEquals('http://example.com/foo.xml', uri)
- 		self.assertEquals('a\'\'\\test', main)
-+
-+	def testParseOld(self):
-+		tmp = tempfile.NamedTemporaryFile()
-+		tmp.write(old_script)
-+		tmp.flush()
-+		tmp.seek(0)
-+		uri, main = alias.parse_script(tmp.name)
-+		self.assertEquals('http://example.com/foo.xml', uri)
-+		self.assertEquals(None, main)
-+
-+		tmp = tempfile.NamedTemporaryFile()
-+		tmp.write(old_script_main)
-+		tmp.flush()
-+		tmp.seek(0)
-+		uri, main = alias.parse_script(tmp.name)
-+		self.assertEquals('http://example.com/foo.xml', uri)
-+		self.assertEquals('a\'\'\\test', main)
- 	
- 	def testParseException(self):
- 		tmp = tempfile.NamedTemporaryFile()
-diff --git a/zeroinstall/alias.py b/zeroinstall/alias.py
-index a7189ab..9b9fa89 100644
---- a/zeroinstall/alias.py
-+++ b/zeroinstall/alias.py
-@@ -8,7 +8,7 @@ Support code for 0alias scripts.
- 
- from zeroinstall import _
- 
--_template = '''#!/bin/sh
-+_old_template = '''#!/bin/sh
- if [ "$*" = "--versions" ]; then
-   exec 0launch -gd '%s' "$@"
- else
-@@ -16,6 +16,10 @@ else
- fi
- ''' 
- 
-+_template = '''#!/bin/sh
-+exec 0launch %s '%s' "$@"
-+'''
-+
- class NotAnAliasScript(Exception):
- 	pass
- 
-@@ -27,12 +31,22 @@ def parse_script(pathname):
- 	@raise NotAnAliasScript: if we can't parse the script
- 	"""
- 	stream = file(pathname)
--	template_header = _template[:_template.index("-gd '")]
-+	template_header = _template[:_template.index("%s '")]
- 	actual_header = stream.read(len(template_header))
--	if template_header != actual_header:
--		raise NotAnAliasScript(_("'%s' does not look like a script created by 0alias") % pathname)
--	rest = stream.read()	# If it's a 0alias script, it should be quite short!
--	line = rest.split('\n')[2]
-+	stream.seek(0)
-+	if template_header == actual_header:
-+		# If it's a 0alias script, it should be quite short!		
-+		rest = stream.read()
-+		line = rest.split('\n')[1]
-+	else:
-+		old_template_header = \
-+		    _old_template[:_old_template.index("-gd '")]
-+		actual_header = stream.read(len(old_template_header))
-+		if old_template_header != actual_header:
-+			raise NotAnAliasScript(_("'%s' does not look like a script created by 0alias") % pathname)
-+		rest = stream.read()	
-+		line = rest.split('\n')[2]
-+
- 	split = line.rfind("' '")
- 	if split != -1:
- 		# We have a --main
-@@ -57,4 +71,4 @@ def write_script(stream, interface_uri, main = None):
- 	else:
- 		main_arg = ""
- 
--	stream.write(_template % (interface_uri, main_arg, interface_uri))
-+	stream.write(_template % (main_arg, interface_uri))
--- 
-1.7.5.4
-

From 4e7cd5b226310c5f669122ca91337fc1d8156ad6 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 14 Jan 2012 03:35:39 -0600
Subject: [PATCH 16/50] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

---
 zeroinstall-injector.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 32055b3..ea40c32 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -5,7 +5,7 @@
 
 Name:    zeroinstall-injector
 Version: 1.2
-Release: 1%{?dist}
+Release: 2%{?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
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Mon Jul 25 2011 Michel Salim <salimma@fedoraproject.org> - 1.2-1
 - Update to 1.2
 

From 82974ebc4297aa0f6956e47eddccab6911a3edf4 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Thu, 26 Jan 2012 18:17:02 +0100
Subject: [PATCH 17/50] Update to 1.5

---
 .gitignore                | 2 +-
 sources                   | 2 +-
 zeroinstall-injector.spec | 7 +++++--
 3 files changed, 7 insertions(+), 4 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 ea40c32..e443598 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -4,8 +4,8 @@
 #global prerel    rc1
 
 Name:    zeroinstall-injector
-Version: 1.2
-Release: 2%{?dist}
+Version: 1.5
+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
+* Thu Jan 26 2012 Michel Salim <salimma@fedoraproject.org> - 1.5-1
+- Update to 1.5
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 

From 260588d8ce87521e1d6b154f60444a09231674d0 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Fri, 27 Jan 2012 13:20:37 +0100
Subject: [PATCH 18/50] Prune dependencies

---
 zeroinstall-injector.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index e443598..aa66742 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 <salimma@fedoraproject.org> - 1.5-2
+- Prune dependencies
+
 * Thu Jan 26 2012 Michel Salim <salimma@fedoraproject.org> - 1.5-1
 - Update to 1.5
 

From 5a8d3c0a7cdc2d5b3a82d7da02433767dd2f7070 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Tue, 24 Apr 2012 11:10:26 +0700
Subject: [PATCH 19/50] 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 aa66742..ab60502 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 <salimma@fedoraproject.org> - 1.7-1
+- Update to 1.7
+
 * Thu Jan 26 2012 Michel Salim <salimma@fedoraproject.org> - 1.5-2
 - Prune dependencies
 

From 828ba3195d2aee71b736ed6ed15cbca4702f6290 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Wed, 23 May 2012 16:43:07 +0700
Subject: [PATCH 20/50] 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 ab60502..5bb0f6a 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 <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
 

From 3ad50d8d52d4f075fba637b14fd80ac870763ef6 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Fri, 29 Jun 2012 10:17:06 +0700
Subject: [PATCH 21/50] 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 5bb0f6a..02cc46a 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 <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
 

From e6759fe76f3bff9bbd9bd53bb6cef035823e2e0c Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sun, 22 Jul 2012 03:13:15 -0500
Subject: [PATCH 22/50] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

---
 zeroinstall-injector.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 02cc46a..1b244a1 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -3,7 +3,7 @@
 
 Name:    zeroinstall-injector
 Version: 1.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -126,6 +126,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
 
 %changelog
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Fri Jun 29 2012 Michel Salim <salimma@fedoraproject.org> - 1.9-1
 - Update to 1.9
 - Remove redundant %%{python_sitelib} declaration

From 6925f1b44d357887afaced352cdce33d2aed0b50 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Fri, 7 Sep 2012 06:24:46 +0700
Subject: [PATCH 23/50] Update to 1.11

---
 .gitignore                | 3 +--
 sources                   | 2 +-
 zeroinstall-injector.spec | 7 +++++--
 3 files changed, 7 insertions(+), 5 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 1b244a1..d35dafd 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -2,8 +2,8 @@
 #global prerel    rc1
 
 Name:    zeroinstall-injector
-Version: 1.9
-Release: 2%{?dist}
+Version: 1.11
+Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -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 <salimma@fedoraproject.org> - 1.11-1
+- Update to 1.11
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

From f91e6810faf905dd2672d69cd7ad4bedde4089f0 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Mon, 19 Nov 2012 14:20:38 +0700
Subject: [PATCH 24/50] 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 <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
+
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 d35dafd..1533a15 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@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
 

From c87f67383941ecf72dc6eed8585efd1db7752c97 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 14 Feb 2013 22:19:03 -0600
Subject: [PATCH 25/50] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

---
 zeroinstall-injector.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 1533a15..1855043 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -4,7 +4,7 @@
 
 Name:    zeroinstall-injector
 Version: 1.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -130,6 +130,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
 
 %changelog
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Mon Nov 19 2012 Michel Salim <salimma@fedoraproject.org> - 1.13-1
 - Update to 1.13
 

From 17d2a6a84944678efbcad572a94ee3d09e7d9c57 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Mon, 25 Feb 2013 19:16:36 +0700
Subject: [PATCH 26/50] Update to 1.16

---
 .gitignore                                |  2 +-
 0install-1.13-testDiag_explicit_cpu.patch | 31 -----------------------
 sources                                   |  2 +-
 zeroinstall-injector.spec                 | 17 +++++++++----
 4 files changed, 14 insertions(+), 38 deletions(-)
 delete mode 100644 0install-1.13-testDiag_explicit_cpu.patch

diff --git a/.gitignore b/.gitignore
index 9fbda4c..255c52b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/0install-1.13.tar.bz2
+/0install-1.16.tar.bz2
diff --git a/0install-1.13-testDiag_explicit_cpu.patch b/0install-1.13-testDiag_explicit_cpu.patch
deleted file mode 100644
index ca649f0..0000000
--- a/0install-1.13-testDiag_explicit_cpu.patch
+++ /dev/null
@@ -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
-
diff --git a/sources b/sources
index f65e17a..2a5bd37 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d0332a8aab5e9f53769e1d4591df2a36  0install-1.13.tar.bz2
+ffdaeece8772859123aa4d059d83cfbc  0install-1.16.tar.bz2
diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 1855043..7eca59c 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -3,16 +3,14 @@
 #global prerel    rc1
 
 Name:    zeroinstall-injector
-Version: 1.13
-Release: 2%{?dist}
+Version: 1.16
+Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 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
@@ -128,8 +125,18 @@ 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}/zsh
+%dir %{_datadir}/zsh/site-functions
+%{_datadir}/zsh/site-functions/_0install
+
 
 %changelog
+* Mon Feb 25 2013 Michel Salim <salimma@fedoraproject.org> - 1.16-1
+- Update to 1.16
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 

From 36865f0049eec467dbadea5c6a6c70bfc361da55 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Tue, 26 Feb 2013 08:52:11 +0700
Subject: [PATCH 27/50] Fix bash-completion path

---
 zeroinstall-injector.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 7eca59c..9bc3db3 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -125,9 +125,9 @@ 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}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/0install
 %dir %{_datadir}/zsh
 %dir %{_datadir}/zsh/site-functions
 %{_datadir}/zsh/site-functions/_0install

From f3af3015e92c3d459090d1291d0e3cc3bab9d89d Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Wed, 6 Mar 2013 15:13:23 +0700
Subject: [PATCH 28/50] Update to 2.0

---
 .gitignore                | 2 +-
 sources                   | 2 +-
 zeroinstall-injector.spec | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 255c52b..c9e2a0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/0install-1.16.tar.bz2
+/0install-2.0.tar.bz2
diff --git a/sources b/sources
index 2a5bd37..d620a1e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ffdaeece8772859123aa4d059d83cfbc  0install-1.16.tar.bz2
+d59b03d1cc8256d9fb331f9412527f82  0install-2.0.tar.bz2
diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 9bc3db3..0786610 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -3,7 +3,7 @@
 #global prerel    rc1
 
 Name:    zeroinstall-injector
-Version: 1.16
+Version: 2.0
 Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
@@ -134,6 +134,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* 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
 

From cdb020ced7be848a80b0a084bbfffa10bbb9903f Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Fri, 5 Apr 2013 17:00:35 +0700
Subject: [PATCH 29/50] Update to 2.1

---
 .gitignore                | 2 +-
 sources                   | 2 +-
 zeroinstall-injector.spec | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index c9e2a0d..94e4f19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/0install-2.0.tar.bz2
+/0install-2.1.tar.bz2
diff --git a/sources b/sources
index d620a1e..9d04beb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d59b03d1cc8256d9fb331f9412527f82  0install-2.0.tar.bz2
+d502e4828165cd259f007bfd96b6a56d  0install-2.1.tar.bz2
diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 0786610..a947aef 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -3,7 +3,7 @@
 #global prerel    rc1
 
 Name:    zeroinstall-injector
-Version: 2.0
+Version: 2.1
 Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
@@ -134,6 +134,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* 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
 
@@ -263,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
 

From ef44d9bc89096372a69f666bbed21be3010764d0 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Tue, 7 May 2013 10:07:18 +0700
Subject: [PATCH 30/50] Update to 2.2

---
 .gitignore                | 2 +-
 sources                   | 2 +-
 zeroinstall-injector.spec | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 94e4f19..aeb89f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/0install-2.1.tar.bz2
+/0install-2.2.tar.bz2
diff --git a/sources b/sources
index 9d04beb..c234164 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d502e4828165cd259f007bfd96b6a56d  0install-2.1.tar.bz2
+f825ee3e0d4682f7cc763b28001809fd  0install-2.2.tar.bz2
diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index a947aef..f1e34dd 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -3,7 +3,7 @@
 #global prerel    rc1
 
 Name:    zeroinstall-injector
-Version: 2.1
+Version: 2.2
 Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
@@ -134,6 +134,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* 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
 

From e8e0f90aa3eb39c06acd4f285aef405d755c45ab Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Tue, 7 May 2013 13:46:14 +0700
Subject: [PATCH 31/50] Adjust for desktop file changes

---
 zeroinstall-injector.spec | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index f1e34dd..665a06f 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -62,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
@@ -113,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/

From f5c97512fda6955d539303a3026fb7d0315b3e5a Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Fri, 5 Jul 2013 08:38:28 +0700
Subject: [PATCH 32/50] Update to 2.3

---
 .gitignore                | 2 +-
 sources                   | 2 +-
 zeroinstall-injector.spec | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index aeb89f6..841d582 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/0install-2.2.tar.bz2
+/0install-2.3.tar.bz2
diff --git a/sources b/sources
index c234164..c87c470 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f825ee3e0d4682f7cc763b28001809fd  0install-2.2.tar.bz2
+d9efe80738db407b191edde4764b789a  0install-2.3.tar.bz2
diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 665a06f..7e89304 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -3,7 +3,7 @@
 #global prerel    rc1
 
 Name:    zeroinstall-injector
-Version: 2.2
+Version: 2.3
 Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
@@ -119,12 +119,18 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %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
+* 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
 

From 09c74d66f0a24a7d9d011b7e79fa952a18701ca4 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sun, 4 Aug 2013 04:49:15 -0500
Subject: [PATCH 33/50] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

---
 zeroinstall-injector.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 7e89304..61ee233 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -4,7 +4,7 @@
 
 Name:    zeroinstall-injector
 Version: 2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -128,6 +128,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Fri Jul  5 2013 Michel Salim <salimma@fedoraproject.org> - 2.3-1
 - Update to 2.3
 

From c9683791e3638f2eaf4cc1ead36d17cc07cca609 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Wed, 14 Aug 2013 11:52:04 +0700
Subject: [PATCH 34/50] Update to 2.3.3

---
 .gitignore                | 2 +-
 sources                   | 2 +-
 zeroinstall-injector.spec | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 841d582..fe4326f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/0install-2.3.tar.bz2
+/0install-2.3.3.tar.bz2
diff --git a/sources b/sources
index c87c470..ea4bd59 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d9efe80738db407b191edde4764b789a  0install-2.3.tar.bz2
+00d567d9086d0b030ac610df6e4cb237  0install-2.3.3.tar.bz2
diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 61ee233..27e903c 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -3,8 +3,8 @@
 #global prerel    rc1
 
 Name:    zeroinstall-injector
-Version: 2.3
-Release: 2%{?dist}
+Version: 2.3.3
+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 || :
 
 
 %changelog
+* Wed Aug 14 2013 Michel Salim <salimma@fedoraproject.org> - 2.3.3-1
+- Update to 2.3.3
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

From a4e3bf9e10e03845fb4c3473dcca6cdada39dca1 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 7 Jun 2014 13:07:00 -0500
Subject: [PATCH 35/50] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

---
 zeroinstall-injector.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 27e903c..74ac338 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -4,7 +4,7 @@
 
 Name:    zeroinstall-injector
 Version: 2.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -128,6 +128,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Wed Aug 14 2013 Michel Salim <salimma@fedoraproject.org> - 2.3.3-1
 - Update to 2.3.3
 

From 5c92de0c1b0cd2c5718ba74921980940d78771e2 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 19 Jun 2015 04:45:52 +0000
Subject: [PATCH 36/50] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 zeroinstall-injector.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 74ac338..0e97db2 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -4,7 +4,7 @@
 
 Name:    zeroinstall-injector
 Version: 2.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -128,6 +128,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

From 067d4aff091493a662850a3a203b88e3007cbcf7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 5 Feb 2016 04:05:27 +0000
Subject: [PATCH 37/50] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 zeroinstall-injector.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 0e97db2..b63f936 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -4,7 +4,7 @@
 
 Name:    zeroinstall-injector
 Version: 2.3.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -128,6 +128,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

From f85dadc199ae8f6312606eedc1fa716d4b2292d2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 19 Jul 2016 13:15:51 +0000
Subject: [PATCH 38/50] -
 https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages

---
 zeroinstall-injector.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index b63f936..ca5cfa6 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -4,7 +4,7 @@
 
 Name:    zeroinstall-injector
 Version: 2.3.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -128,6 +128,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.3-5
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From 9276d6eacf019069052d3ff4383e6216437b9f6b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 11 Feb 2017 18:23:43 +0000
Subject: [PATCH 39/50] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 zeroinstall-injector.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index ca5cfa6..b536e75 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -4,7 +4,7 @@
 
 Name:    zeroinstall-injector
 Version: 2.3.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -128,6 +128,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.3-5
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
 

From 9fbefc40829792915f52b988719e4213908d3bee Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 27 Jul 2017 22:42:01 +0000
Subject: [PATCH 40/50] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 zeroinstall-injector.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index b536e75..fc1e5bd 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -4,7 +4,7 @@
 
 Name:    zeroinstall-injector
 Version: 2.3.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -128,6 +128,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From f52b8aa0d3e17e093c4599e93a706b8ca3b63d7b Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Thu, 18 Jan 2018 22:58:25 +0100
Subject: [PATCH 41/50] Remove obsolete scriptlets

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 zeroinstall-injector.spec | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index fc1e5bd..8a1f752 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -4,7 +4,7 @@
 
 Name:    zeroinstall-injector
 Version: 2.3.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -89,19 +89,6 @@ useradd -r -g zeroinst -d %{cache_dir} -s /sbin/nologin \
     -c "Zero Install shared cache" zeroinst
 exit 0
 
-%post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-
 %files -f zero-install.lang
 %defattr(-,root,root,-)
 %doc COPYING README.md
@@ -128,6 +115,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.3.3-8
+- Remove obsolete scriptlets
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From d6370485737154fa5fefa9931e2bc5bb454a61c0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 9 Feb 2018 22:26:42 +0000
Subject: [PATCH 42/50] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zeroinstall-injector.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 8a1f752..ed1cc50 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -4,7 +4,7 @@
 
 Name:    zeroinstall-injector
 Version: 2.3.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -115,6 +115,9 @@ exit 0
 
 
 %changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.3.3-8
 - Remove obsolete scriptlets
 

From b83781adaa6fca7ca79e6a14cfd135930326920d Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Wed, 14 Feb 2018 09:02:56 +0100
Subject: [PATCH 43/50] Remove %clean section

None of currently supported distributions need that.
Last one was EL5 which is EOL for a while.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 zeroinstall-injector.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index ed1cc50..abe3902 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -75,9 +75,6 @@ for t in download packagekit; do
 done
 ./testall.py
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %pre
 # Add the "zeroinst" user.

From 2a10a1fe0a1b1b6db3ff12e8e1276d67045b0e03 Mon Sep 17 00:00:00 2001
From: Iryna Shcherbina <shcherbina.iryna@gmail.com>
Date: Wed, 14 Feb 2018 17:28:26 +0100
Subject: [PATCH 44/50] Update Python 2 dependency declarations to new
 packaging standards

---
 zeroinstall-injector.spec | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index abe3902..ad1d068 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -4,7 +4,7 @@
 
 Name:    zeroinstall-injector
 Version: 2.3.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -13,18 +13,18 @@ URL:     http://0install.net
 Source0: http://downloads.sf.net/project/zero-install/%{upstream_name}/%{version}/%{upstream_name}-%{version}.tar.bz2
 
 BuildArch: noarch
-BuildRequires: python-devel >= 2.6
+BuildRequires: python2-devel >= 2.6
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 # for-tests
 BuildRequires: pygtk2 gnupg xdg-utils
 BuildRequires: tar gzip bzip2 xz-lzma-compat
-BuildRequires: python-coverage
+BuildRequires: python2-coverage
 # /for-tests
 Requires:      pygtk2 gnupg sudo xdg-utils
 Requires:      tar gzip bzip2 xz-lzma-compat
 # for PackageKit support
-Requires:      dbus-python
+Requires:      python2-dbus
 
 Requires(pre): shadow-utils
 
@@ -112,6 +112,10 @@ exit 0
 
 
 %changelog
+* Wed Feb 14 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.3.3-10
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From 709b9f8a5d0ece65668e5fc60eb7f00b47babac5 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Mon, 9 Jul 2018 23:14:27 -0500
Subject: [PATCH 45/50] Remove needless use of %defattr

---
 zeroinstall-injector.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index ad1d068..633d9e2 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -87,7 +87,6 @@ useradd -r -g zeroinst -d %{cache_dir} -s /sbin/nologin \
 exit 0
 
 %files -f zero-install.lang
-%defattr(-,root,root,-)
 %doc COPYING README.md
 %{_bindir}/0*
 %{_datadir}/applications/*.desktop

From bc05855afeb713bbee410098596ff8444793bba8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 14 Jul 2018 09:49:25 +0000
Subject: [PATCH 46/50] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zeroinstall-injector.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 633d9e2..49ea8a5 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -4,7 +4,7 @@
 
 Name:    zeroinstall-injector
 Version: 2.3.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -111,6 +111,9 @@ exit 0
 
 
 %changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed Feb 14 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.3.3-10
 - Update Python 2 dependency declarations to new packaging standards
   (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)

From fdfe532aa1d7b0f7578f721e887321f3c77906f5 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sun, 29 Jul 2018 23:12:06 +0200
Subject: [PATCH 47/50] =?UTF-8?q?%{python=5Fsitelib}=20=E2=86=92=20%{pytho?=
 =?UTF-8?q?n2=5Fsitelib}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 zeroinstall-injector.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 49ea8a5..f3ceade 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -92,9 +92,9 @@ exit 0
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/zeroinstall.png
 %{_datadir}/icons/hicolor/scalable/apps/zeroinstall.svg
-%{python_sitelib}/zeroinstall/
+%{python2_sitelib}/zeroinstall/
 %if 0%{!?el5:1}
-%{python_sitelib}/*.egg-info
+%{python2_sitelib}/*.egg-info
 %endif
 %{_mandir}/man1/0*
 %dir %{cache_dir}

From 10c82f1be1592220a9f3300ac4c665f617bb581f Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sun, 29 Jul 2018 23:25:40 +0200
Subject: [PATCH 48/50] Switch to %py2_build

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 zeroinstall-injector.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index f3ceade..00eca3f 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -54,7 +54,7 @@ automatically check for updates when software is run.
 %setup -q -n %{upstream_name}-%{version}
 
 %build
-%{__python} setup.py build
+%py2_build
 
 %install
 rm -rf $RPM_BUILD_ROOT

From 685341c055fcb1364f8b03d6295db48c92ab0289 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sun, 29 Jul 2018 23:27:23 +0200
Subject: [PATCH 49/50] Switch to %py2_install

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 zeroinstall-injector.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 00eca3f..de52b82 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -58,7 +58,7 @@ automatically check for updates when software is run.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+%py2_install
 mv "$RPM_BUILD_ROOT/usr/man" "$RPM_BUILD_ROOT/%{_datadir}/man"
 mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations"
 

From 43b4972eb3e5bbdce4a8ca2894ad959fc5b402a0 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <michel@michel-slm.name>
Date: Sat, 25 Aug 2018 09:19:30 -0700
Subject: [PATCH 50/50] obsoleted by 0install

---
 .gitignore                |   1 -
 dead.package              |   1 +
 sources                   |   1 -
 zeroinstall-injector.spec | 294 --------------------------------------
 4 files changed, 1 insertion(+), 296 deletions(-)
 delete mode 100644 .gitignore
 create mode 100644 dead.package
 delete mode 100644 sources
 delete mode 100644 zeroinstall-injector.spec

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index fe4326f..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/0install-2.3.3.tar.bz2
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..931b22b
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+obsoleted by 0install
diff --git a/sources b/sources
deleted file mode 100644
index ea4bd59..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-00d567d9086d0b030ac610df6e4cb237  0install-2.3.3.tar.bz2
diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
deleted file mode 100644
index de52b82..0000000
--- a/zeroinstall-injector.spec
+++ /dev/null
@@ -1,294 +0,0 @@
-%global cache_dir /var/cache/0install.net
-%global upstream_name 0install
-#global prerel    rc1
-
-Name:    zeroinstall-injector
-Version: 2.3.3
-Release: 11%{?dist}
-Summary: The Zero Install Injector (0launch)
-
-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
-
-BuildArch: noarch
-BuildRequires: python2-devel >= 2.6
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-# for-tests
-BuildRequires: pygtk2 gnupg xdg-utils
-BuildRequires: tar gzip bzip2 xz-lzma-compat
-BuildRequires: python2-coverage
-# /for-tests
-Requires:      pygtk2 gnupg sudo xdg-utils
-Requires:      tar gzip bzip2 xz-lzma-compat
-# for PackageKit support
-Requires:      python2-dbus
-
-Requires(pre): shadow-utils
-
-# for icons
-Requires:      hicolor-icon-theme
-
-%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.
-
-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 -n %{upstream_name}-%{version}
-
-%build
-%py2_build
-
-%install
-rm -rf $RPM_BUILD_ROOT
-%py2_install
-mv "$RPM_BUILD_ROOT/usr/man" "$RPM_BUILD_ROOT/%{_datadir}/man"
-mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations"
-
-desktop-file-validate \
-    $RPM_BUILD_ROOT%{_datadir}/applications/0install.desktop
-
-%find_lang zero-install
-
-%check
-export PYTHONPATH=`pwd`
-cd tests
-for t in download packagekit; do
-  mv test${t}.py{,.off}
-done
-./testall.py
-
-
-%pre
-# Add the "zeroinst" user.
-# This is not used by default, but is required if you want to
-# set up sharing of downloads later.
-getent group  zeroinst >/dev/null || groupadd -r zeroinst
-getent passwd zeroinst >/dev/null || \
-useradd -r -g zeroinst -d %{cache_dir} -s /sbin/nologin \
-    -c "Zero Install shared cache" zeroinst
-exit 0
-
-%files -f zero-install.lang
-%doc COPYING README.md
-%{_bindir}/0*
-%{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/apps/zeroinstall.png
-%{_datadir}/icons/hicolor/scalable/apps/zeroinstall.svg
-%{python2_sitelib}/zeroinstall/
-%if 0%{!?el5:1}
-%{python2_sitelib}/*.egg-info
-%endif
-%{_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
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 14 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.3.3-10
-- Update Python 2 dependency declarations to new packaging standards
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.3.3-8
-- Remove obsolete scriptlets
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.3-5
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed Aug 14 2013 Michel Salim <salimma@fedoraproject.org> - 2.3.3-1
-- Update to 2.3.3
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* 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
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.13-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* 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
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* 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
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Jul 25 2011 Michel Salim <salimma@fedoraproject.org> - 1.2-1
-- Update to 1.2
-
-* Sat Jul  2 2011 Michel Salim <salimma@fedoraproject.org> - 1.1-2
-- Further launcher script clean-up
-
-* Wed Jun 29 2011 Michel Salim <salimma@fedoraproject.org> - 1.1-1
-- Update to 1.1
-- Remove --versions option, obsoleted in favor of '0alias launcher'
-
-* Wed Jun 22 2011 Michel Salim <salimma@fedoraproject.org> - 1.0-3
-- Fix --versions handling of 0alias-generated launchers
-
-* Wed Jun 15 2011 Michel Salim <salimma@fedoraproject.org> - 1.0-2
-- Add main category "System" to desktop entries
-
-* Tue Jun 14 2011 Michel Salim <salimma@fedoraproject.org> - 1.0-1
-- Update to 1.0
-
-* Tue May  3 2011 Michel Salim <salimma@fedoraproject.org> - 1.0-0.rc1.1
-- Update to 1.0rc1
-
-* Thu Mar 17 2011 Michel Salim <salimma@fedoraproject.org> - 0.53-1
-- Update to 0.53
-
-* Sun Mar 13 2011 Michel Salim <salimma@fedoraproject.org> - 0.52-1
-- Update to 0.52
-
-* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 0.49-3
-- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
-
-* Fri Jul  9 2010 Michel Salim <salimma@fedoraproject.org> - 0.49-2
-- Enable tests
-
-* Fri Jul  9 2010 Michel Salim <salimma@fedoraproject.org> - 0.49-1
-- Update to 0.49
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.38-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Sat Feb 28 2009 Michel Salim <salimma@fedoraproject.org> - 0.38-2
-- Workaround for RHEL's desktop-file-utils
-- Add missing dependency on xdg-utils
-
-* Fri Feb 27 2009 Michel Salim <salimma@fedoraproject.org> - 0.38-1
-- Update to 0.38
-- Upgrades now preserve the existing menu, if modified
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.34-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.34-2
-- Rebuild for Python 2.6
-
-* Sun Aug  3 2008 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.34-1
-- Update to 0.34
-
-* Sat Apr  5 2008 Michel Salim <salimma@fedoraproject.org> - 0.32-1
-- Update to 0.32
-- Package .egg-info file on Fedora >= 9
-
-* Fri Jan 18 2008 Michel Salim <michel.sylvan@gmail.com> - 0.31-1
-- Update to 0.31
-
-* Sat Sep  8 2007 Michel Salim <michel.sylvan@gmail.com> 0.30-2
-- Update scriptlet that creates zeroinst user
-
-* Wed Sep  5 2007 Michel Salim <michel.sylvan@gmail.com> 0.30-1
-- Update to 0.30
-- License is now versioned
-- Incorporate changes from Thomas Leonard:
-  * create zeroinst user
-  * create shared cache
-
-* Mon Dec 18 2006 Michel Salim <michel.salim@gmail.com> 0.24-3
-- Rebuild for development branch
-
-* Sat Nov 11 2006 Michel Salim <michel.salim@gmail.com> 0.24-2
-- Allow installation of ix86 binaries on x86_64
-
-* Sat Nov  4 2006 Michel Salim <michel.salim@gmail.com> 0.24-1
-- Update to 0.24
-- Not ghosting .pyos any longer
-
-* Sun Oct  8 2006 Michel Salim <michel.salim@gmail.com> 0.23-1
-- Update to 0.23
-
-* Sun Mar  5 2006 Michel Salim <michel.salim@gmail.com> 0.18-4
-- Removed left-behind pushd and popd
-
-* 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
-
-* Thu Feb 16 2006 Michel Salim <michel.salim@gmail.com> 0.18-1
-- Initial Fedora Extras release, based on upstream spec contributed by Juan Carlos Jimenez Garcia