From 23b12eb7fb7ecd6dd555a3d90cecc5122cabe11a Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 7 Sep 2012 06:24:46 +0700 Subject: [PATCH 1/9] 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 02cc46a..2bd0e67 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 9521fd0b46bea56f9553e7959bb124386fc97410 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 19 Nov 2012 14:20:38 +0700 Subject: [PATCH 2/9] 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 2bd0e67..438f95c 100644 --- a/zeroinstall-injector.spec +++ b/zeroinstall-injector.spec @@ -1,15 +1,18 @@ %global cache_dir /var/cache/0install.net +%global upstream_name 0install #global prerel rc1 Name: zeroinstall-injector -Version: 1.11 +Version: 1.13 Release: 1%{?dist} Summary: The Zero Install Injector (0launch) Group: Applications/System License: LGPLv2 URL: http://0install.net -Source0: http://downloads.sourceforge.net/project/zero-install/injector/%{version}/%{name}-%{version}.tar.bz2 +Source0: http://downloads.sf.net/project/zero-install/%{upstream_name}/%{version}/%{upstream_name}-%{version}.tar.bz2 +# https://github.com/0install/0install/pull/7 +Patch0: %{upstream_name}-1.13-testDiag_explicit_cpu.patch BuildArch: noarch BuildRequires: python-devel >= 2.6 @@ -50,7 +53,8 @@ the package is run during install or uninstall. The system can automatically check for updates when software is run. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{upstream_name}-%{version} +%patch0 -p1 -b .testDiag_explicit_cpu %build %{__python} setup.py build @@ -110,7 +114,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f zero-install.lang %defattr(-,root,root,-) -%doc COPYING README +%doc COPYING README.md %{_bindir}/0* %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/zeroinstall.menu %{_datadir}/applications/*.desktop @@ -126,6 +130,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations %changelog +* Mon Nov 19 2012 Michel Salim - 1.13-1 +- Update to 1.13 + * Wed Sep 5 2012 Michel Salim - 1.11-1 - Update to 1.11 From 0eec4ad0a52e4cdf3c7daa436b313eb50406e1c5 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 25 Feb 2013 19:16:36 +0700 Subject: [PATCH 3/9] 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 438f95c..8a982ef 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 12544fc874981ac332124635402a801921d1cfc7 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 26 Feb 2013 08:52:11 +0700 Subject: [PATCH 4/9] 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 8a982ef..bd02b6f 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 864739e03f5bdd1dca6b49fb99f86d03f7e907bf Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Wed, 6 Mar 2013 15:13:23 +0700 Subject: [PATCH 5/9] 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 bd02b6f..1e98b9e 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 a992a040a16dbbafcd76c64e15bb3485ded41454 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 5 Apr 2013 17:00:35 +0700 Subject: [PATCH 6/9] 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 1e98b9e..26ce700 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 @@ -257,7 +260,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 a8ae0c3b51cbc44da3a8b570f2cc9a6d47408aef Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 7 May 2013 10:07:18 +0700 Subject: [PATCH 7/9] 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 26ce700..d89cc23 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 ce6e02efce9b8fa78f31967430049791ba8c75ec Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 7 May 2013 13:46:14 +0700 Subject: [PATCH 8/9] 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 d89cc23..958aab0 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 7a6999802f329f28819cc2df6406fb1f2a4f97bf Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 5 Jul 2013 08:38:28 +0700 Subject: [PATCH 9/9] 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 958aab0..7768180 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