From 576ab07096e24d0b4cce5434d01959df2c554d27 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:08:51 +0000 Subject: [PATCH 01/57] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d195006..18ceb05 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +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)) From b4550228d0f5ee81bf2fd75e16ec2afd31a52eb5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:30:04 +0000 Subject: [PATCH 02/57] Initialize branch EL-6 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..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 54c527c93249ccb1f5d13adb3b39e568c8e6fd3f Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 9 Jul 2010 10:32:18 +0000 Subject: [PATCH 03/57] - 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 - 0.49-1 +- Update to 0.49 + * Mon Jul 27 2009 Fedora Release Engineering - 0.38-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From d29d17e3a98fef7bbfe7a667c5dbe173a305c4e1 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 9 Jul 2010 11:06:26 +0000 Subject: [PATCH 04/57] 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 4c57fc479d3ae17960d7cae0f51266f17676d999 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 9 Jul 2010 15:23:04 +0000 Subject: [PATCH 05/57] - 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 - 0.49-2 +- Enable tests + * Fri Jul 9 2010 Michel Salim - 0.49-1 - Update to 0.49 From bb7f65e266f8fbef3b1be4270472c53d41d703a9 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 9 Jul 2010 15:52:36 +0000 Subject: [PATCH 06/57] 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 fa66227e0a48e149aa472a117a9e8b3070cafaa6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:29:08 +0000 Subject: [PATCH 07/57] 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 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 From 4e7cd5b226310c5f669122ca91337fc1d8156ad6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:35:39 -0600 Subject: [PATCH 08/57] - 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 - 1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Jul 25 2011 Michel Salim - 1.2-1 - Update to 1.2 From 82974ebc4297aa0f6956e47eddccab6911a3edf4 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 26 Jan 2012 18:17:02 +0100 Subject: [PATCH 09/57] 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 - 1.5-1 +- Update to 1.5 + * Sat Jan 14 2012 Fedora Release Engineering - 1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 5b26f05f7f8835d9b461416c7e4cf8cca67c8e24 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 26 Jan 2012 18:17:02 +0100 Subject: [PATCH 10/57] Update to 1.5 --- .gitignore | 2 +- sources | 2 +- zeroinstall-injector.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f18ab91..a7acccd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/zeroinstall-injector-1.2.tar.bz2 +/zeroinstall-injector-1.5.tar.bz2 diff --git a/sources b/sources index 329c616..cbac6da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f1cb7cb2a86f0b7d01add5991af2640 zeroinstall-injector-1.2.tar.bz2 +a1e0291183520875704386ddbc22cc5d zeroinstall-injector-1.5.tar.bz2 diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec index 32055b3..95db68e 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -4,7 +4,7 @@ #global prerel rc1 Name: zeroinstall-injector -Version: 1.2 +Version: 1.5 Release: 1%{?dist} Summary: The Zero Install Injector (0launch) @@ -128,6 +128,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations %changelog +* Thu Jan 26 2012 Michel Salim - 1.5-1 +- Update to 1.5 + * Mon Jul 25 2011 Michel Salim - 1.2-1 - Update to 1.2 From 260588d8ce87521e1d6b154f60444a09231674d0 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 27 Jan 2012 13:20:37 +0100 Subject: [PATCH 11/57] 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 - 1.5-2 +- Prune dependencies + * Thu Jan 26 2012 Michel Salim - 1.5-1 - Update to 1.5 From d4befe92e60bcb4c80cdfa15ed5eb7b965f2bc4f Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 27 Jan 2012 13:20:37 +0100 Subject: [PATCH 12/57] Prune dependencies --- zeroinstall-injector.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec index 95db68e..9a5a8fa 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -5,7 +5,7 @@ Name: zeroinstall-injector Version: 1.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Zero Install Injector (0launch) Group: Applications/System @@ -18,11 +18,11 @@ BuildRequires: python-devel >= 2.6 BuildRequires: desktop-file-utils BuildRequires: gettext # for-tests -BuildRequires: PyXML pygtk2 gnupg xdg-utils +BuildRequires: pygtk2 gnupg xdg-utils BuildRequires: tar gzip bzip2 xz-lzma-compat BuildRequires: python-coverage # /for-tests -Requires: PyXML pygtk2 gnupg sudo xdg-utils +Requires: pygtk2 gnupg sudo xdg-utils Requires: tar gzip bzip2 xz-lzma-compat # for PackageKit support Requires: dbus-python @@ -128,6 +128,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations %changelog +* Thu Jan 26 2012 Michel Salim - 1.5-2 +- Prune dependencies + * Thu Jan 26 2012 Michel Salim - 1.5-1 - Update to 1.5 From 5a8d3c0a7cdc2d5b3a82d7da02433767dd2f7070 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 24 Apr 2012 11:10:26 +0700 Subject: [PATCH 13/57] 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 - 1.7-1 +- Update to 1.7 + * Thu Jan 26 2012 Michel Salim - 1.5-2 - Prune dependencies From 17f4901557fee725777dff9e1c438349e73380a4 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 24 Apr 2012 11:10:26 +0700 Subject: [PATCH 14/57] Update to 1.7 --- .gitignore | 2 +- sources | 2 +- zeroinstall-injector.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a7acccd..7cf7596 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/zeroinstall-injector-1.5.tar.bz2 +/zeroinstall-injector-1.7.tar.bz2 diff --git a/sources b/sources index cbac6da..f9fc99d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1e0291183520875704386ddbc22cc5d zeroinstall-injector-1.5.tar.bz2 +23e2adf699c52f8cdfbb7ad07d6c5568 zeroinstall-injector-1.7.tar.bz2 diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec index 9a5a8fa..e9f4c3f 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -4,8 +4,8 @@ #global prerel rc1 Name: zeroinstall-injector -Version: 1.5 -Release: 2%{?dist} +Version: 1.7 +Release: 1%{?dist} Summary: The Zero Install Injector (0launch) Group: Applications/System @@ -128,6 +128,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations %changelog +* Tue Apr 24 2012 Michel Salim - 1.7-1 +- Update to 1.7 + * Thu Jan 26 2012 Michel Salim - 1.5-2 - Prune dependencies From 828ba3195d2aee71b736ed6ed15cbca4702f6290 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Wed, 23 May 2012 16:43:07 +0700 Subject: [PATCH 15/57] 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 - 1.8-1 +- Update to 1.8 + * Tue Apr 24 2012 Michel Salim - 1.7-1 - Update to 1.7 From e277580c341e8e7e8ce827a958f3daec805a4d6c Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Wed, 23 May 2012 16:43:07 +0700 Subject: [PATCH 16/57] Update to 1.8 --- .gitignore | 2 +- sources | 2 +- zeroinstall-injector.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7cf7596..ff8e3f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/zeroinstall-injector-1.7.tar.bz2 +/zeroinstall-injector-1.8.tar.bz2 diff --git a/sources b/sources index f9fc99d..7e22049 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -23e2adf699c52f8cdfbb7ad07d6c5568 zeroinstall-injector-1.7.tar.bz2 +00b3e8b3cbfbe8ed55f81842a4d2c386 zeroinstall-injector-1.8.tar.bz2 diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec index e9f4c3f..afe29e2 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -4,7 +4,7 @@ #global prerel rc1 Name: zeroinstall-injector -Version: 1.7 +Version: 1.8 Release: 1%{?dist} Summary: The Zero Install Injector (0launch) @@ -128,6 +128,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations %changelog +* Wed May 23 2012 Michel Salim - 1.8-1 +- Update to 1.8 + * Tue Apr 24 2012 Michel Salim - 1.7-1 - Update to 1.7 From 3ad50d8d52d4f075fba637b14fd80ac870763ef6 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 29 Jun 2012 10:17:06 +0700 Subject: [PATCH 17/57] 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 - 1.9-1 +- Update to 1.9 +- Remove redundant %%{python_sitelib} declaration + * Wed May 23 2012 Michel Salim - 1.8-1 - Update to 1.8 From c40a0d93e58caf40a332502c8ead918594a2cbdd Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 29 Jun 2012 10:17:06 +0700 Subject: [PATCH 18/57] Update to 1.9 - Remove redundant %{python_sitelib} declaration --- .gitignore | 1 + sources | 2 +- zeroinstall-injector.spec | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ff8e3f3..c96ec6b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /zeroinstall-injector-1.8.tar.bz2 +/zeroinstall-injector-1.9.tar.bz2 diff --git a/sources b/sources index 7e22049..45871ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -00b3e8b3cbfbe8ed55f81842a4d2c386 zeroinstall-injector-1.8.tar.bz2 +3c5065d147320f8953e148c6f55d89db zeroinstall-injector-1.9.tar.bz2 diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec index afe29e2..7a94ab8 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -1,10 +1,8 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - %global cache_dir /var/cache/0install.net #global prerel rc1 Name: zeroinstall-injector -Version: 1.8 +Version: 1.9 Release: 1%{?dist} Summary: The Zero Install Injector (0launch) @@ -128,6 +126,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations %changelog +* Fri Jun 29 2012 Michel Salim - 1.9-1 +- Update to 1.9 +- Remove redundant %%{python_sitelib} declaration + * Wed May 23 2012 Michel Salim - 1.8-1 - Update to 1.8 From e6759fe76f3bff9bbd9bd53bb6cef035823e2e0c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 03:13:15 -0500 Subject: [PATCH 19/57] - 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 - 1.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jun 29 2012 Michel Salim - 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 Date: Fri, 7 Sep 2012 06:24:46 +0700 Subject: [PATCH 20/57] 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 - 1.11-1 +- Update to 1.11 + * Sun Jul 22 2012 Fedora Release Engineering - 1.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 32aefa0d63cef012df393e25faa9553e37350c06 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 7 Sep 2012 06:24:46 +0700 Subject: [PATCH 21/57] Update to 1.11 --- .gitignore | 3 +-- sources | 2 +- zeroinstall-injector.spec | 5 ++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c96ec6b..f6faae6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/zeroinstall-injector-1.8.tar.bz2 -/zeroinstall-injector-1.9.tar.bz2 +/zeroinstall-injector-1.11.tar.bz2 diff --git a/sources b/sources index 45871ea..d082a99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3c5065d147320f8953e148c6f55d89db zeroinstall-injector-1.9.tar.bz2 +20eb0497c8df9864e353411a13c41844 zeroinstall-injector-1.11.tar.bz2 diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec index 7a94ab8..408d835 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -2,7 +2,7 @@ #global prerel rc1 Name: zeroinstall-injector -Version: 1.9 +Version: 1.11 Release: 1%{?dist} Summary: The Zero Install Injector (0launch) @@ -126,6 +126,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations %changelog +* Wed Sep 5 2012 Michel Salim - 1.11-1 +- Update to 1.11 + * Fri Jun 29 2012 Michel Salim - 1.9-1 - Update to 1.9 - Remove redundant %%{python_sitelib} declaration From f91e6810faf905dd2672d69cd7ad4bedde4089f0 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 19 Nov 2012 14:20:38 +0700 Subject: [PATCH 22/57] Update to 1.13 --- .gitignore | 2 +- 0install-1.13-testDiag_explicit_cpu.patch | 31 +++++++++++++++++++++++ sources | 2 +- zeroinstall-injector.spec | 15 ++++++++--- 4 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 0install-1.13-testDiag_explicit_cpu.patch diff --git a/.gitignore b/.gitignore index f6faae6..9fbda4c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/zeroinstall-injector-1.11.tar.bz2 +/0install-1.13.tar.bz2 diff --git a/0install-1.13-testDiag_explicit_cpu.patch b/0install-1.13-testDiag_explicit_cpu.patch new file mode 100644 index 0000000..ca649f0 --- /dev/null +++ b/0install-1.13-testDiag_explicit_cpu.patch @@ -0,0 +1,31 @@ +From afb51d4969fde294fcc9846548c2950cfabf2935 Mon Sep 17 00:00:00 2001 +From: Michel Alexandre Salim +Date: Mon, 19 Nov 2012 14:00:33 +0700 +Subject: [PATCH] testsolver/testDiagnostics: set required CPU explicitly + +One of the tests (line 415) assume the host CPU to be x86_64, and does +not explicitly override the CPU field of the Requirements object. This +causes an assertion error on other architectures, as the expected error +message is only displayed if the host CPU is x86_64. + +By manually setting r.cpu = 'x86_64', the test works even on other +archs. +--- + tests/testsolver.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/testsolver.py b/tests/testsolver.py +index 3c7f78d..ceee5ee 100755 +--- a/tests/testsolver.py ++++ b/tests/testsolver.py +@@ -440,6 +440,7 @@ class TestSolver(BaseTest): + impl = self.config.iface_cache.get_feed(diag_uri).implementations['diag-5'] + r = Requirements(top_uri) + r.os = 'Windows' ++ r.cpu = 'x86_64' + self.assertEqual("There is no possible selection using Diagnostics 5.\n" + "Can't find all required implementations:\n" + "- http://localhost/diagnostics.xml -> (problem)\n" +-- +1.8.0 + diff --git a/sources b/sources index d082a99..f65e17a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -20eb0497c8df9864e353411a13c41844 zeroinstall-injector-1.11.tar.bz2 +d0332a8aab5e9f53769e1d4591df2a36 0install-1.13.tar.bz2 diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec index 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 - 1.13-1 +- Update to 1.13 + * Wed Sep 5 2012 Michel Salim - 1.11-1 - Update to 1.11 From 560a6cf5d604667c8c2f0ee5608f45e2c2ba03ee Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 19 Nov 2012 14:20:38 +0700 Subject: [PATCH 23/57] Update to 1.13 --- .gitignore | 2 +- 0install-1.13-testDiag_explicit_cpu.patch | 31 +++++++++++++++++++++++ sources | 2 +- zeroinstall-injector.spec | 15 ++++++++--- 4 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 0install-1.13-testDiag_explicit_cpu.patch diff --git a/.gitignore b/.gitignore index f6faae6..9fbda4c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/zeroinstall-injector-1.11.tar.bz2 +/0install-1.13.tar.bz2 diff --git a/0install-1.13-testDiag_explicit_cpu.patch b/0install-1.13-testDiag_explicit_cpu.patch new file mode 100644 index 0000000..ca649f0 --- /dev/null +++ b/0install-1.13-testDiag_explicit_cpu.patch @@ -0,0 +1,31 @@ +From afb51d4969fde294fcc9846548c2950cfabf2935 Mon Sep 17 00:00:00 2001 +From: Michel Alexandre Salim +Date: Mon, 19 Nov 2012 14:00:33 +0700 +Subject: [PATCH] testsolver/testDiagnostics: set required CPU explicitly + +One of the tests (line 415) assume the host CPU to be x86_64, and does +not explicitly override the CPU field of the Requirements object. This +causes an assertion error on other architectures, as the expected error +message is only displayed if the host CPU is x86_64. + +By manually setting r.cpu = 'x86_64', the test works even on other +archs. +--- + tests/testsolver.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/testsolver.py b/tests/testsolver.py +index 3c7f78d..ceee5ee 100755 +--- a/tests/testsolver.py ++++ b/tests/testsolver.py +@@ -440,6 +440,7 @@ class TestSolver(BaseTest): + impl = self.config.iface_cache.get_feed(diag_uri).implementations['diag-5'] + r = Requirements(top_uri) + r.os = 'Windows' ++ r.cpu = 'x86_64' + self.assertEqual("There is no possible selection using Diagnostics 5.\n" + "Can't find all required implementations:\n" + "- http://localhost/diagnostics.xml -> (problem)\n" +-- +1.8.0 + diff --git a/sources b/sources index d082a99..f65e17a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -20eb0497c8df9864e353411a13c41844 zeroinstall-injector-1.11.tar.bz2 +d0332a8aab5e9f53769e1d4591df2a36 0install-1.13.tar.bz2 diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec index 408d835..82c3180 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -1,15 +1,18 @@ %global cache_dir /var/cache/0install.net +%global upstream_name 0install #global prerel rc1 Name: zeroinstall-injector -Version: 1.11 +Version: 1.13 Release: 1%{?dist} Summary: The Zero Install Injector (0launch) Group: Applications/System License: LGPLv2 URL: http://0install.net -Source0: http://downloads.sourceforge.net/project/zero-install/injector/%{version}/%{name}-%{version}.tar.bz2 +Source0: http://downloads.sf.net/project/zero-install/%{upstream_name}/%{version}/%{upstream_name}-%{version}.tar.bz2 +# https://github.com/0install/0install/pull/7 +Patch0: %{upstream_name}-1.13-testDiag_explicit_cpu.patch BuildArch: noarch BuildRequires: python-devel >= 2.6 @@ -50,7 +53,8 @@ the package is run during install or uninstall. The system can automatically check for updates when software is run. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{upstream_name}-%{version} +%patch0 -p1 -b .testDiag_explicit_cpu %build %{__python} setup.py build @@ -110,7 +114,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f zero-install.lang %defattr(-,root,root,-) -%doc COPYING README +%doc COPYING README.md %{_bindir}/0* %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/zeroinstall.menu %{_datadir}/applications/*.desktop @@ -126,6 +130,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations %changelog +* Mon Nov 19 2012 Michel Salim - 1.13-1 +- Update to 1.13 + * Wed Sep 5 2012 Michel Salim - 1.11-1 - Update to 1.11 From c87f67383941ecf72dc6eed8585efd1db7752c97 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 22:19:03 -0600 Subject: [PATCH 24/57] - 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 - 1.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Mon Nov 19 2012 Michel Salim - 1.13-1 - Update to 1.13 From 17d2a6a84944678efbcad572a94ee3d09e7d9c57 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 25 Feb 2013 19:16:36 +0700 Subject: [PATCH 25/57] 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 -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 - 1.16-1 +- Update to 1.16 + * Fri Feb 15 2013 Fedora Release Engineering - 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 Date: Tue, 26 Feb 2013 08:52:11 +0700 Subject: [PATCH 26/57] 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 6c03c6309ff539574d7860fea56071ed7c5f1379 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 25 Feb 2013 19:16:36 +0700 Subject: [PATCH 27/57] Update to 1.16 --- .gitignore | 2 +- 0install-1.13-testDiag_explicit_cpu.patch | 31 ----------------------- sources | 2 +- zeroinstall-injector.spec | 15 ++++++++--- 4 files changed, 13 insertions(+), 37 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 -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 82c3180..064ab1b 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -3,7 +3,7 @@ #global prerel rc1 Name: zeroinstall-injector -Version: 1.13 +Version: 1.16 Release: 1%{?dist} Summary: The Zero Install Injector (0launch) @@ -11,8 +11,6 @@ Group: Applications/System License: LGPLv2 URL: http://0install.net Source0: http://downloads.sf.net/project/zero-install/%{upstream_name}/%{version}/%{upstream_name}-%{version}.tar.bz2 -# https://github.com/0install/0install/pull/7 -Patch0: %{upstream_name}-1.13-testDiag_explicit_cpu.patch BuildArch: noarch BuildRequires: python-devel >= 2.6 @@ -54,7 +52,6 @@ automatically check for updates when software is run. %prep %setup -q -n %{upstream_name}-%{version} -%patch0 -p1 -b .testDiag_explicit_cpu %build %{__python} setup.py build @@ -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 - 1.16-1 +- Update to 1.16 + * Mon Nov 19 2012 Michel Salim - 1.13-1 - Update to 1.13 From a6dfc15154a63c42166c509a1f22e93e5a83ebea Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 26 Feb 2013 08:52:11 +0700 Subject: [PATCH 28/57] 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 064ab1b..82680bf 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 Date: Wed, 6 Mar 2013 15:13:23 +0700 Subject: [PATCH 29/57] 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 - 2.0-1 +- Update to 2.0 + * Mon Feb 25 2013 Michel Salim - 1.16-1 - Update to 1.16 From ca63333d2e77b272d5b204dd85e6716d9de1b1ff Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Wed, 6 Mar 2013 15:13:23 +0700 Subject: [PATCH 30/57] 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 82680bf..d678fa6 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 - 2.0-1 +- Update to 2.0 + * Mon Feb 25 2013 Michel Salim - 1.16-1 - Update to 1.16 From cdb020ced7be848a80b0a084bbfffa10bbb9903f Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 5 Apr 2013 17:00:35 +0700 Subject: [PATCH 31/57] 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 - 2.1-1 +- Update to 2.1 + * Wed Mar 6 2013 Michel Salim - 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 0.18-3 - Add Python-related requirements, BuildReq on gnupg to decrypt upstream source - + * Sat Feb 18 2006 Michel Salim 0.18-2 - Use _mandir, discard CFLAGS and unused python_sitearch definition From b2a7ca63841f97025bc6ae065b613f944bc22c6f Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 5 Apr 2013 17:00:35 +0700 Subject: [PATCH 32/57] 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 d678fa6..fb189f7 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 - 2.1-1 +- Update to 2.1 + * Wed Mar 6 2013 Michel Salim - 2.0-1 - Update to 2.0 @@ -254,7 +257,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Sat Feb 25 2006 Michel Salim 0.18-3 - Add Python-related requirements, BuildReq on gnupg to decrypt upstream source - + * Sat Feb 18 2006 Michel Salim 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 Date: Tue, 7 May 2013 10:07:18 +0700 Subject: [PATCH 33/57] 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 - 2.2-1 +- Update to 2.2 + * Fri Apr 5 2013 Michel Salim - 2.1-1 - Update to 2.1 From e8e0f90aa3eb39c06acd4f285aef405d755c45ab Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 7 May 2013 13:46:14 +0700 Subject: [PATCH 34/57] 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 722cba054a7e38fd595145b4acc9bff31e0ca898 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 7 May 2013 10:07:18 +0700 Subject: [PATCH 35/57] Update to 2.2 (cherry picked from commit ef44d9bc89096372a69f666bbed21be3010764d0) --- .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 fb189f7..db2ce57 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 - 2.2-1 +- Update to 2.2 + * Fri Apr 5 2013 Michel Salim - 2.1-1 - Update to 2.1 From b6913cd448c43e69120cd43d6968fe5829fd3783 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 7 May 2013 13:46:14 +0700 Subject: [PATCH 36/57] Adjust for desktop file changes (cherry picked from commit e8e0f90aa3eb39c06acd4f285aef405d755c45ab) --- zeroinstall-injector.spec | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec index db2ce57..197ee59 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 Date: Fri, 5 Jul 2013 08:38:28 +0700 Subject: [PATCH 37/57] 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 - 2.3-1 +- Update to 2.3 + * Mon May 6 2013 Michel Salim - 2.2-1 - Update to 2.2 From 728d9c59f5caddf6d189c40dd35860621abe87b7 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 5 Jul 2013 08:38:28 +0700 Subject: [PATCH 38/57] Update to 2.3 (cherry picked from commit f5c97512fda6955d539303a3026fb7d0315b3e5a) --- .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 197ee59..6681f1e 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 - 2.3-1 +- Update to 2.3 + * Mon May 6 2013 Michel Salim - 2.2-1 - Update to 2.2 From 09c74d66f0a24a7d9d011b7e79fa952a18701ca4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 04:49:15 -0500 Subject: [PATCH 39/57] - 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 - 2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Jul 5 2013 Michel Salim - 2.3-1 - Update to 2.3 From c9683791e3638f2eaf4cc1ead36d17cc07cca609 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Wed, 14 Aug 2013 11:52:04 +0700 Subject: [PATCH 40/57] 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 - 2.3.3-1 +- Update to 2.3.3 + * Sun Aug 04 2013 Fedora Release Engineering - 2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 8336308396b75ae65d0e774e15dfeddf910a5a34 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Wed, 14 Aug 2013 11:52:04 +0700 Subject: [PATCH 41/57] Update to 2.3.3 (cherry picked from commit c9683791e3638f2eaf4cc1ead36d17cc07cca609) --- .gitignore | 2 +- sources | 2 +- zeroinstall-injector.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 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 6681f1e..cb3ee02 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -3,7 +3,7 @@ #global prerel rc1 Name: zeroinstall-injector -Version: 2.3 +Version: 2.3.3 Release: 1%{?dist} Summary: The Zero Install Injector (0launch) @@ -128,6 +128,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Wed Aug 14 2013 Michel Salim - 2.3.3-1 +- Update to 2.3.3 + * Fri Jul 5 2013 Michel Salim - 2.3-1 - Update to 2.3 From a4e3bf9e10e03845fb4c3473dcca6cdada39dca1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 13:07:00 -0500 Subject: [PATCH 42/57] - 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 - 2.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed Aug 14 2013 Michel Salim - 2.3.3-1 - Update to 2.3.3 From 5c92de0c1b0cd2c5718ba74921980940d78771e2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:45:52 +0000 Subject: [PATCH 43/57] - 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 - 2.3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 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 Date: Fri, 5 Feb 2016 04:05:27 +0000 Subject: [PATCH 44/57] - 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 - 2.3.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 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 Date: Tue, 19 Jul 2016 13:15:51 +0000 Subject: [PATCH 45/57] - 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 - 2.3.3-5 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Fri Feb 05 2016 Fedora Release Engineering - 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 Date: Sat, 11 Feb 2017 18:23:43 +0000 Subject: [PATCH 46/57] - 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 - 2.3.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Jul 19 2016 Fedora Release Engineering - 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 Date: Thu, 27 Jul 2017 22:42:01 +0000 Subject: [PATCH 47/57] - 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 - 2.3.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 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 Date: Thu, 18 Jan 2018 22:58:25 +0100 Subject: [PATCH 48/57] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- 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 - 2.3.3-8 +- Remove obsolete scriptlets + * Thu Jul 27 2017 Fedora Release Engineering - 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 Date: Fri, 9 Feb 2018 22:26:42 +0000 Subject: [PATCH 49/57] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 2.3.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jan 18 2018 Igor Gnatenko - 2.3.3-8 - Remove obsolete scriptlets From b83781adaa6fca7ca79e6a14cfd135930326920d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 09:02:56 +0100 Subject: [PATCH 50/57] 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 --- 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 Date: Wed, 14 Feb 2018 17:28:26 +0100 Subject: [PATCH 51/57] 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 - 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 - 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 Date: Mon, 9 Jul 2018 23:14:27 -0500 Subject: [PATCH 52/57] 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 Date: Sat, 14 Jul 2018 09:49:25 +0000 Subject: [PATCH 53/57] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 2.3.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 14 2018 Iryna Shcherbina - 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 Date: Sun, 29 Jul 2018 23:12:06 +0200 Subject: [PATCH 54/57] =?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 --- 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 Date: Sun, 29 Jul 2018 23:25:40 +0200 Subject: [PATCH 55/57] Switch to %py2_build Signed-off-by: Igor Gnatenko --- 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 Date: Sun, 29 Jul 2018 23:27:23 +0200 Subject: [PATCH 56/57] Switch to %py2_install Signed-off-by: Igor Gnatenko --- 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 Date: Sat, 25 Aug 2018 09:19:30 -0700 Subject: [PATCH 57/57] 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 - 2.3.3-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 14 2018 Iryna Shcherbina - 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 - 2.3.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 18 2018 Igor Gnatenko - 2.3.3-8 -- Remove obsolete scriptlets - -* Thu Jul 27 2017 Fedora Release Engineering - 2.3.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.3.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jul 19 2016 Fedora Release Engineering - 2.3.3-5 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Fri Feb 05 2016 Fedora Release Engineering - 2.3.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 2.3.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 2.3.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Aug 14 2013 Michel Salim - 2.3.3-1 -- Update to 2.3.3 - -* Sun Aug 04 2013 Fedora Release Engineering - 2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Jul 5 2013 Michel Salim - 2.3-1 -- Update to 2.3 - -* Mon May 6 2013 Michel Salim - 2.2-1 -- Update to 2.2 - -* Fri Apr 5 2013 Michel Salim - 2.1-1 -- Update to 2.1 - -* Wed Mar 6 2013 Michel Salim - 2.0-1 -- Update to 2.0 - -* Mon Feb 25 2013 Michel Salim - 1.16-1 -- Update to 1.16 - -* Fri Feb 15 2013 Fedora Release Engineering - 1.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Nov 19 2012 Michel Salim - 1.13-1 -- Update to 1.13 - -* Wed Sep 5 2012 Michel Salim - 1.11-1 -- Update to 1.11 - -* Sun Jul 22 2012 Fedora Release Engineering - 1.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jun 29 2012 Michel Salim - 1.9-1 -- Update to 1.9 -- Remove redundant %%{python_sitelib} declaration - -* Wed May 23 2012 Michel Salim - 1.8-1 -- Update to 1.8 - -* Tue Apr 24 2012 Michel Salim - 1.7-1 -- Update to 1.7 - -* Thu Jan 26 2012 Michel Salim - 1.5-2 -- Prune dependencies - -* Thu Jan 26 2012 Michel Salim - 1.5-1 -- Update to 1.5 - -* Sat Jan 14 2012 Fedora Release Engineering - 1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Jul 25 2011 Michel Salim - 1.2-1 -- Update to 1.2 - -* Sat Jul 2 2011 Michel Salim - 1.1-2 -- Further launcher script clean-up - -* Wed Jun 29 2011 Michel Salim - 1.1-1 -- Update to 1.1 -- Remove --versions option, obsoleted in favor of '0alias launcher' - -* Wed Jun 22 2011 Michel Salim - 1.0-3 -- Fix --versions handling of 0alias-generated launchers - -* Wed Jun 15 2011 Michel Salim - 1.0-2 -- Add main category "System" to desktop entries - -* Tue Jun 14 2011 Michel Salim - 1.0-1 -- Update to 1.0 - -* Tue May 3 2011 Michel Salim - 1.0-0.rc1.1 -- Update to 1.0rc1 - -* Thu Mar 17 2011 Michel Salim - 0.53-1 -- Update to 0.53 - -* Sun Mar 13 2011 Michel Salim - 0.52-1 -- Update to 0.52 - -* Thu Jul 22 2010 David Malcolm - 0.49-3 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Fri Jul 9 2010 Michel Salim - 0.49-2 -- Enable tests - -* Fri Jul 9 2010 Michel Salim - 0.49-1 -- Update to 0.49 - -* Mon Jul 27 2009 Fedora Release Engineering - 0.38-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Sat Feb 28 2009 Michel Salim - 0.38-2 -- Workaround for RHEL's desktop-file-utils -- Add missing dependency on xdg-utils - -* Fri Feb 27 2009 Michel Salim - 0.38-1 -- Update to 0.38 -- Upgrades now preserve the existing menu, if modified - -* Wed Feb 25 2009 Fedora Release Engineering - 0.34-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.34-2 -- Rebuild for Python 2.6 - -* Sun Aug 3 2008 Michel Alexandre Salim - 0.34-1 -- Update to 0.34 - -* Sat Apr 5 2008 Michel Salim - 0.32-1 -- Update to 0.32 -- Package .egg-info file on Fedora >= 9 - -* Fri Jan 18 2008 Michel Salim - 0.31-1 -- Update to 0.31 - -* Sat Sep 8 2007 Michel Salim 0.30-2 -- Update scriptlet that creates zeroinst user - -* Wed Sep 5 2007 Michel Salim 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 0.24-3 -- Rebuild for development branch - -* Sat Nov 11 2006 Michel Salim 0.24-2 -- Allow installation of ix86 binaries on x86_64 - -* Sat Nov 4 2006 Michel Salim 0.24-1 -- Update to 0.24 -- Not ghosting .pyos any longer - -* Sun Oct 8 2006 Michel Salim 0.23-1 -- Update to 0.23 - -* Sun Mar 5 2006 Michel Salim 0.18-4 -- Removed left-behind pushd and popd - -* Sat Feb 25 2006 Michel Salim 0.18-3 -- Add Python-related requirements, BuildReq on gnupg to decrypt upstream source - -* Sat Feb 18 2006 Michel Salim 0.18-2 -- Use _mandir, discard CFLAGS and unused python_sitearch definition - -* Thu Feb 16 2006 Michel Salim 0.18-1 -- Initial Fedora Extras release, based on upstream spec contributed by Juan Carlos Jimenez Garcia