From 00172877ff9bf284ac893fea4e2cae35466dba4c Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 17 Feb 2014 20:34:00 +0700 Subject: [PATCH 01/36] Initial import --- .gitignore | 1 + 0install-2.6-no-tests.patch | 11 +++ 0install-2.6.1-lib64.patch | 31 +++++++ 0install.spec | 169 ++++++++++++++++++++++++++++++++++++ sources | 1 + 5 files changed, 213 insertions(+) create mode 100644 0install-2.6-no-tests.patch create mode 100644 0install-2.6.1-lib64.patch create mode 100644 0install.spec diff --git a/.gitignore b/.gitignore index e69de29..9b430a7 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/0install-2.6.1.tar.bz2 diff --git a/0install-2.6-no-tests.patch b/0install-2.6-no-tests.patch new file mode 100644 index 0000000..d5aeaa7 --- /dev/null +++ b/0install-2.6-no-tests.patch @@ -0,0 +1,11 @@ +--- 0install-2.6/ocaml/Makefile.no-tests 2014-01-20 01:49:14.000000000 +0700 ++++ 0install-2.6/ocaml/Makefile 2014-01-20 19:23:48.945070803 +0700 +@@ -11,7 +11,7 @@ + + .PHONY: all ocaml doc clean tags test + +-all: build_dir ocaml test ++all: build_dir ocaml + + build_dir: + [ -d "${OCAML_BUILDDIR}" ] || mkdir -p "${OCAML_BUILDDIR}" diff --git a/0install-2.6.1-lib64.patch b/0install-2.6.1-lib64.patch new file mode 100644 index 0000000..f2795bc --- /dev/null +++ b/0install-2.6.1-lib64.patch @@ -0,0 +1,31 @@ +--- 0install-2.6.1/ocaml/zeroinstall/gui.ml.lib64 2014-02-02 22:38:45.000000000 +0700 ++++ 0install-2.6.1/ocaml/zeroinstall/gui.ml 2014-02-14 10:35:52.191819061 +0700 +@@ -372,7 +372,7 @@ + if system#file_exists plugin_path then Some plugin_path else None in + + let plugin_path = +- let sys_lib = Filename.dirname bindir +/ "lib" in ++ let sys_lib = Filename.dirname bindir +/ "lib64" in + U.first_match check_plugin_dir [ + (* Is 0install is installed as distro package? *) + sys_lib +/ "0install.net"; +--- 0install-2.6.1/install.sh.src.lib64 2014-02-02 22:38:45.000000000 +0700 ++++ 0install-2.6.1/install.sh.src 2014-02-14 10:38:52.092214497 +0700 +@@ -75,7 +75,7 @@ + install -d "$DESTDIR${PREFIX_SHARE}/fish/completions" + install -d "$DESTDIR${PREFIX_SHARE}/doc/0install" + install -d "$DESTDIR${PREFIX}/${ZSHFUNCTIONS}" +-install -d "$DESTDIR${PREFIX}/lib/0install.net" ++install -d "$DESTDIR${PREFIX}/lib64/0install.net" + + install -m 0644 ${DOCS} "$DESTDIR${PREFIX_SHARE}/doc/0install/" + install -m 0644 ${MANPAGES} "$DESTDIR${PREFIX_MAN}/man1/" +@@ -91,7 +91,7 @@ + install -m 0755 share/0install.net/unxz "$DESTDIR${PREFIX_SHARE}/0install.net/" + + if [ -f "$PLUGIN" ]; then +- install -m 0644 "$PLUGIN" "$DESTDIR${PREFIX}/lib/0install.net/" ++ install -m 0644 "$PLUGIN" "$DESTDIR${PREFIX}/lib64/0install.net/" + fi + + for size in 24x24 48x48 128x128 scalable; do \ diff --git a/0install.spec b/0install.spec new file mode 100644 index 0000000..8e05920 --- /dev/null +++ b/0install.spec @@ -0,0 +1,169 @@ +%global cache_dir /var/cache/0install.net + +Name: 0install +Version: 2.6.1 +Release: 2%{?dist} +Summary: A decentralized cross-distribution software installation system + +License: LGPLv2+ +URL: http://0install.net +Source0: http://downloads.sf.net/project/zero-install/%{name}/%{version}/%{name}-%{version}.tar.bz2 +# Temporarily disable tests, some failures within mock env +Patch0: %{name}-2.6-no-tests.patch +# multilib: use lib64 instead of lib on 64-bit arches +Patch1: %{name}-2.6.1-lib64.patch + +ExclusiveArch: %{ocaml_arches} + +BuildRequires: ocaml >= 3.10.0 +BuildRequires: ocaml-biniou-devel +BuildRequires: ocaml-easy-format-devel +BuildRequires: ocaml-findlib +BuildRequires: ocaml-camlp4-devel +BuildRequires: ocaml-curl-devel +BuildRequires: ocaml-extlib-devel +BuildRequires: ocaml-lablgtk-devel +BuildRequires: ocaml-lwt-devel +# not packaged yet, optional +# BuildRequires: ocaml-obus-devel +BuildRequires: ocaml-ounit-devel +BuildRequires: ocaml-ssl-devel +BuildRequires: ocaml-xmlm-devel +BuildRequires: ocaml-yojson-devel +BuildRequires: glib2-devel +BuildRequires: libev-devel +BuildRequires: gettext +BuildRequires: desktop-file-utils + +Requires(pre): shadow-utils + +# for icons +Requires: hicolor-icon-theme + +Provides: zeroinstall-injector = %{version}-%{release} +Obsoletes: zeroinstall-injector < 2.4-1%{?dist} + +%description +Zero Install is a decentralized cross-distribution software +installation system available under the LGPL. It allows software +developers to publish programs directly from their own web-sites, +while supporting features familiar from centralized distribution +repositories such as shared libraries, automatic updates and digital +signatures. It is intended to complement, rather than replace, the +operating system's package management. 0install packages never +interfere with those provided by the distribution. + +0install does not define a new packaging format; unmodified tarballs +or zip archives can be used. Instead, it defines an XML metadata +format to describe these packages and the dependencies between them. A +single metadata file can be used on multiple platforms (e.g. Ubuntu, +Debian, Fedora, openSUSE, Mac OS X and Windows), assuming binary or +source archives are available that work on those systems. + +0install also has some interesting features not often found in +traditional package managers. For example, while it will share +libraries whenever possible, it can always install multiple versions +of a package in parallel when there are conflicting +requirements. Installation is always side-effect-free (each package is +unpacked to its own directory and will not touch shared directories +such as /usr/bin), making it ideal for use with sandboxing +technologies and virtualization. + +The XML file describing the program's requirements can also be +included in a source-code repository, allowing full dependency +handling for unreleased developer versions. For example, a user can +clone a Git repository and build and test the program, automatically +downloading newer versions of libraries where necessary, without +interfering with the versions of those libraries installed by their +distribution, which continue to be used for other software. + + +%prep +%setup -q +%patch0 -p1 -b .no-tests +%if "%{_lib}" == "lib64" +%patch1 -p1 -b .lib64 +%endif + + +%build +make + + +%install +make install_system DESTDIR=$RPM_BUILD_ROOT + +# fix permission of shared objects +chmod +x $RPM_BUILD_ROOT%{_libdir}/0install.net/gui_gtk.cmxs + +mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations" + +desktop-file-validate \ + $RPM_BUILD_ROOT%{_datadir}/applications/0install.desktop + +%find_lang zero-install + + +%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 + +%post +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + +%files -f zero-install.lang +%doc COPYING README.md +%{_bindir}/0* +%{_libdir}/0install.net +%{_datadir}/0install.net +%{_datadir}/applications/0install.desktop +%{_datadir}/icons/hicolor/*/apps/zeroinstall.* +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions +%{_datadir}/bash-completion/completions/0* +%dir %{_datadir}/fish +%dir %{_datadir}/fish/completions +%{_datadir}/fish/completions/0*.fish +%dir %{_datadir}/zsh +%dir %{_datadir}/zsh/site-functions +%{_datadir}/zsh/site-functions/_0* +%{_mandir}/man1/0* +%dir %{cache_dir} +%attr(755,zeroinst,zeroinst) %{cache_dir}/implementations + + +%changelog +* Sat Feb 15 2014 Michel Salim - 2.6.1-2 +- Spec clean-up +- Fix permission of shared objects so they get properly handled when + generating debuginfo + +* Fri Feb 14 2014 Michel Salim - 2.6.1-1 +- Update to 2.6.1 +- Install to proper libdir depending on the actual architecture +- Fix ExclusiveArch, build requirements and obsoletion +- Fix license tag +- Yank old changelog from zero-install + +* Mon Jan 20 2014 Michel Salim - 2.6-1 +- Update to 2.6 + +* Mon Jan 20 2014 Michel Salim - 2.5.1-1 +- Rename package to 0install +- Update to 2.5.1 diff --git a/sources b/sources index e69de29..3d297a0 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +3795b93a32f31d15aa38430f76a4415a 0install-2.6.1.tar.bz2 From 31e84b641968ef39e170b853052ffdac04440119 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 17:09:58 -0500 Subject: [PATCH 02/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- 0install.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/0install.spec b/0install.spec index 8e05920..31c2776 100644 --- a/0install.spec +++ b/0install.spec @@ -2,7 +2,7 @@ Name: 0install Version: 2.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A decentralized cross-distribution software installation system License: LGPLv2+ @@ -149,6 +149,9 @@ fi %changelog +* Fri Jun 06 2014 Fedora Release Engineering - 2.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Feb 15 2014 Michel Salim - 2.6.1-2 - Spec clean-up - Fix permission of shared objects so they get properly handled when From a3f28011b3b75de5e2d4e68e232d4a53865f0ee2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 17:14:28 -0500 Subject: [PATCH 03/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- 0install.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/0install.spec b/0install.spec index 31c2776..3c5fff2 100644 --- a/0install.spec +++ b/0install.spec @@ -2,7 +2,7 @@ Name: 0install Version: 2.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A decentralized cross-distribution software installation system License: LGPLv2+ @@ -149,6 +149,9 @@ fi %changelog +* Fri Jun 06 2014 Fedora Release Engineering - 2.6.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri Jun 06 2014 Fedora Release Engineering - 2.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 77b9e88f55963e16dcf1462c5012a60515f5a9f0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 17:20:08 -0500 Subject: [PATCH 04/36] Remove the no longer needed ExclusiveArch line the macro used has been removed --- 0install.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/0install.spec b/0install.spec index 3c5fff2..c265ce3 100644 --- a/0install.spec +++ b/0install.spec @@ -13,8 +13,6 @@ Patch0: %{name}-2.6-no-tests.patch # multilib: use lib64 instead of lib on 64-bit arches Patch1: %{name}-2.6.1-lib64.patch -ExclusiveArch: %{ocaml_arches} - BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-biniou-devel BuildRequires: ocaml-easy-format-devel @@ -149,8 +147,8 @@ fi %changelog -* Fri Jun 06 2014 Fedora Release Engineering - 2.6.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild +* Fri Jun 06 2014 Dennis Gilmore - 2.6.1-4 +- Remove the no longer needed ExclusiveArch line the macro used has been removed * Fri Jun 06 2014 Fedora Release Engineering - 2.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 461732add7095a04e85c991d47ee4bfe8d14d953 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 18:01:25 +0000 Subject: [PATCH 05/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- 0install.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/0install.spec b/0install.spec index c265ce3..9619da8 100644 --- a/0install.spec +++ b/0install.spec @@ -2,7 +2,7 @@ Name: 0install Version: 2.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A decentralized cross-distribution software installation system License: LGPLv2+ @@ -147,6 +147,9 @@ fi %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 2.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Jun 06 2014 Dennis Gilmore - 2.6.1-4 - Remove the no longer needed ExclusiveArch line the macro used has been removed From 30778ee08db2679211a338825b5377638f4c3b2e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 22:37:15 +0000 Subject: [PATCH 06/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- 0install.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/0install.spec b/0install.spec index 9619da8..c5ea54d 100644 --- a/0install.spec +++ b/0install.spec @@ -2,7 +2,7 @@ Name: 0install Version: 2.6.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A decentralized cross-distribution software installation system License: LGPLv2+ @@ -147,6 +147,9 @@ fi %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 2.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Aug 15 2014 Fedora Release Engineering - 2.6.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 5339e55c6c41071a09906339e283a85ae26beecf Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Thu, 1 Oct 2015 18:18:33 +1000 Subject: [PATCH 07/36] Update to 2.9.1 --- .gitignore | 1 + 0install-2.6.1-lib64.patch | 31 ------------------------------- 0install-2.9.1-lib64.patch | 34 ++++++++++++++++++++++++++++++++++ 0install.spec | 29 ++++++++++++++++++++++------- sources | 2 +- 5 files changed, 58 insertions(+), 39 deletions(-) delete mode 100644 0install-2.6.1-lib64.patch create mode 100644 0install-2.9.1-lib64.patch diff --git a/.gitignore b/.gitignore index 9b430a7..04bf391 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /0install-2.6.1.tar.bz2 +/0install-2.9.1.tar.bz2 diff --git a/0install-2.6.1-lib64.patch b/0install-2.6.1-lib64.patch deleted file mode 100644 index f2795bc..0000000 --- a/0install-2.6.1-lib64.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- 0install-2.6.1/ocaml/zeroinstall/gui.ml.lib64 2014-02-02 22:38:45.000000000 +0700 -+++ 0install-2.6.1/ocaml/zeroinstall/gui.ml 2014-02-14 10:35:52.191819061 +0700 -@@ -372,7 +372,7 @@ - if system#file_exists plugin_path then Some plugin_path else None in - - let plugin_path = -- let sys_lib = Filename.dirname bindir +/ "lib" in -+ let sys_lib = Filename.dirname bindir +/ "lib64" in - U.first_match check_plugin_dir [ - (* Is 0install is installed as distro package? *) - sys_lib +/ "0install.net"; ---- 0install-2.6.1/install.sh.src.lib64 2014-02-02 22:38:45.000000000 +0700 -+++ 0install-2.6.1/install.sh.src 2014-02-14 10:38:52.092214497 +0700 -@@ -75,7 +75,7 @@ - install -d "$DESTDIR${PREFIX_SHARE}/fish/completions" - install -d "$DESTDIR${PREFIX_SHARE}/doc/0install" - install -d "$DESTDIR${PREFIX}/${ZSHFUNCTIONS}" --install -d "$DESTDIR${PREFIX}/lib/0install.net" -+install -d "$DESTDIR${PREFIX}/lib64/0install.net" - - install -m 0644 ${DOCS} "$DESTDIR${PREFIX_SHARE}/doc/0install/" - install -m 0644 ${MANPAGES} "$DESTDIR${PREFIX_MAN}/man1/" -@@ -91,7 +91,7 @@ - install -m 0755 share/0install.net/unxz "$DESTDIR${PREFIX_SHARE}/0install.net/" - - if [ -f "$PLUGIN" ]; then -- install -m 0644 "$PLUGIN" "$DESTDIR${PREFIX}/lib/0install.net/" -+ install -m 0644 "$PLUGIN" "$DESTDIR${PREFIX}/lib64/0install.net/" - fi - - for size in 24x24 48x48 128x128 scalable; do \ diff --git a/0install-2.9.1-lib64.patch b/0install-2.9.1-lib64.patch new file mode 100644 index 0000000..76b11a4 --- /dev/null +++ b/0install-2.9.1-lib64.patch @@ -0,0 +1,34 @@ +diff -up ./install.sh.src.orig ./install.sh.src +--- ./install.sh.src.orig 2015-09-02 14:39:32.011146045 +1000 ++++ ./install.sh.src 2015-09-02 14:40:31.756148173 +1000 +@@ -76,7 +76,7 @@ install -d "$DESTDIR${PREFIX_SHARE}/bash + install -d "$DESTDIR${PREFIX_SHARE}/fish/completions" + install -d "$DESTDIR${PREFIX_SHARE}/doc/0install" + install -d "$DESTDIR${PREFIX}/${ZSHFUNCTIONS}" +-install -d "$DESTDIR${PREFIX}/lib/0install.net" ++install -d "$DESTDIR${PREFIX}/lib64/0install.net" + + install -m 0644 ${DOCS} "$DESTDIR${PREFIX_SHARE}/doc/0install/" + install -m 0644 ${MANPAGES} "$DESTDIR${PREFIX_MAN}/man1/" +@@ -93,7 +93,7 @@ install -m 0755 share/0install.net/unlzm + install -m 0755 share/0install.net/unxz "$DESTDIR${PREFIX_SHARE}/0install.net/" + + if [ -n "$PLUGINS" ]; then +- install -m 0644 $PLUGINS "$DESTDIR${PREFIX}/lib/0install.net/" ++ install -m 0644 $PLUGINS "$DESTDIR${PREFIX}/lib64/0install.net/" + fi + + for size in 24x24 48x48 128x128 scalable; do \ +diff -up ./ocaml/Makefile.orig ./ocaml/Makefile +diff -up ./ocaml/zeroinstall/gui.ml.orig ./ocaml/zeroinstall/gui.ml +--- ./ocaml/zeroinstall/gui.ml.orig 2015-09-02 14:32:01.260129993 +1000 ++++ ./ocaml/zeroinstall/gui.ml 2015-09-02 14:34:51.351136051 +1000 +@@ -337,7 +337,7 @@ let try_get_gui config ~use_gui = + if system#file_exists plugin_path then Some plugin_path else None in + + let plugin_path = +- let sys_lib = Filename.dirname bindir +/ "lib" in ++ let sys_lib = Filename.dirname bindir +/ "lib64" in + U.first_match check_plugin_dir [ + (* Was 0install installed with opam? *) + sys_lib +/ "0install"; diff --git a/0install.spec b/0install.spec index c5ea54d..8dc496a 100644 --- a/0install.spec +++ b/0install.spec @@ -1,8 +1,8 @@ %global cache_dir /var/cache/0install.net - +%global gettext_domain_name zero-install Name: 0install -Version: 2.6.1 -Release: 6%{?dist} +Version: 2.9.1 +Release: 1%{?dist} Summary: A decentralized cross-distribution software installation system License: LGPLv2+ @@ -11,7 +11,7 @@ Source0: http://downloads.sf.net/project/zero-install/%{name}/%{version}/ # Temporarily disable tests, some failures within mock env Patch0: %{name}-2.6-no-tests.patch # multilib: use lib64 instead of lib on 64-bit arches -Patch1: %{name}-2.6.1-lib64.patch +Patch1: %{name}-2.9.1-lib64.patch BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-biniou-devel @@ -38,6 +38,13 @@ Requires(pre): shadow-utils # for icons Requires: hicolor-icon-theme +%if 0%{?epel} +# Explict require ocaml-react-devel, otherwise +# ocamlfind: Package `lwt.react' not found +BuildRequires: ocaml-react-devel +ExcludeArch: ppc64 +%endif + Provides: zeroinstall-injector = %{version}-%{release} Obsoletes: zeroinstall-injector < 2.4-1%{?dist} @@ -80,7 +87,7 @@ distribution, which continue to be used for other software. %setup -q %patch0 -p1 -b .no-tests %if "%{_lib}" == "lib64" -%patch1 -p1 -b .lib64 +%patch1 -p0 -b .lib64 %endif @@ -99,8 +106,10 @@ mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations" desktop-file-validate \ $RPM_BUILD_ROOT%{_datadir}/applications/0install.desktop -%find_lang zero-install +%find_lang %{gettext_domain_name} +## Remove excess doc +rm -fr %{buildroot}/usr/share/doc/%{name} %pre # Add the "zeroinst" user. @@ -125,11 +134,12 @@ fi /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%files -f zero-install.lang +%files -f %{gettext_domain_name}.lang %doc COPYING README.md %{_bindir}/0* %{_libdir}/0install.net %{_datadir}/0install.net +%{_datadir}/appdata/0install* %{_datadir}/applications/0install.desktop %{_datadir}/icons/hicolor/*/apps/zeroinstall.* %dir %{_datadir}/bash-completion @@ -147,6 +157,11 @@ fi %changelog +* Thu Oct 01 2015 Ding-Yi Chen - 2.9.1-1 +- Upstream update to 2.9.1. +- Add buildrequires: ocaml-react-devel for EPEL. +- Exclude ppc64 for EPEL, as the build dependency ocaml-findlib-devel is not available on it. + * Tue Jun 16 2015 Fedora Release Engineering - 2.6.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 3d297a0..c903da4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3795b93a32f31d15aa38430f76a4415a 0install-2.6.1.tar.bz2 +37093e67e3ae21a89f3b7fb217941437 0install-2.9.1.tar.bz2 From e0f946676186579005d3093eddddba8be33d5f39 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 6 Oct 2015 17:33:39 +1000 Subject: [PATCH 08/36] Upstream update to 0instal-2.10 --- .gitignore | 1 + 0install-2.10-makefile.patch | 23 +++++++++++++++++++++++ 0install.spec | 13 +++++++++++-- sources | 2 +- 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 0install-2.10-makefile.patch diff --git a/.gitignore b/.gitignore index 04bf391..bcb2ccc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /0install-2.6.1.tar.bz2 /0install-2.9.1.tar.bz2 +/0install-2.10.tar.bz2 diff --git a/0install-2.10-makefile.patch b/0install-2.10-makefile.patch new file mode 100644 index 0000000..f72ca3f --- /dev/null +++ b/0install-2.10-makefile.patch @@ -0,0 +1,23 @@ +diff -up ./Makefile.translation ./Makefile +--- ./Makefile.translation 2015-10-05 00:41:05.000000000 +1000 ++++ ./Makefile 2015-10-06 17:06:42.633307106 +1000 +@@ -54,7 +54,13 @@ default: all + [ -d "${DISTDIR}" ] || mkdir "${DISTDIR}" + $(MAKE) -C "${BUILDDIR}" -f "${SRCDIR}/Makefile.build" "$@" SRCDIR="${SRCDIR}" BUILDDIR="${BUILDDIR}" DISTDIR="${DISTDIR}" DESTDIR="${DESTDIR}" + ++po-files=$(shell find . -name '*.po') ++mo-files=$(subst po,mo,$(po-files)) ++update-mo: ${mo-files} ++ ++ + share/locale/zero-install.pot: $(SH) ++ touch $@ + xgettext --sort-by-file --language=Shell -j --output=$@ $(SH) + + update-po: share/locale/zero-install.pot +@@ -73,4 +79,4 @@ clean: + rm -rf build + rm -rf dist + +-.PHONY: update-po check-po clean default ++.PHONY: update-po update-mo check-po clean default diff --git a/0install.spec b/0install.spec index 8dc496a..5e3d0f6 100644 --- a/0install.spec +++ b/0install.spec @@ -1,7 +1,7 @@ %global cache_dir /var/cache/0install.net %global gettext_domain_name zero-install Name: 0install -Version: 2.9.1 +Version: 2.10 Release: 1%{?dist} Summary: A decentralized cross-distribution software installation system @@ -12,6 +12,7 @@ Source0: http://downloads.sf.net/project/zero-install/%{name}/%{version}/ Patch0: %{name}-2.6-no-tests.patch # multilib: use lib64 instead of lib on 64-bit arches Patch1: %{name}-2.9.1-lib64.patch +Patch2: %{name}-2.10-makefile.patch BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-biniou-devel @@ -89,10 +90,11 @@ distribution, which continue to be used for other software. %if "%{_lib}" == "lib64" %patch1 -p0 -b .lib64 %endif - +%patch2 -p0 -b .translation %build make +make update-mo %install @@ -106,6 +108,10 @@ mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations" desktop-file-validate \ $RPM_BUILD_ROOT%{_datadir}/applications/0install.desktop +## Copy mo files +mkdir -p %{buildroot}%{_datadir}/locale +cp -R build/share/locale/* %{buildroot}%{_datadir}/locale + %find_lang %{gettext_domain_name} ## Remove excess doc @@ -157,6 +163,9 @@ fi %changelog +* Tue Oct 06 2015 Ding-Yi Chen - 2.10-1 +- Upstream update to 2.10. + * Thu Oct 01 2015 Ding-Yi Chen - 2.9.1-1 - Upstream update to 2.9.1. - Add buildrequires: ocaml-react-devel for EPEL. diff --git a/sources b/sources index c903da4..477831d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -37093e67e3ae21a89f3b7fb217941437 0install-2.9.1.tar.bz2 +3db5bca7df2c01f9c74e57b503d9dd39 0install-2.10.tar.bz2 From b76909b91d81d3c3efd2052b9e1fc742fce836d8 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 6 Oct 2015 18:28:41 +1000 Subject: [PATCH 09/36] Remove Utilities from .desktop file, so it will use Settings as main category --- 0install.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/0install.spec b/0install.spec index 5e3d0f6..5c755ee 100644 --- a/0install.spec +++ b/0install.spec @@ -92,6 +92,9 @@ distribution, which continue to be used for other software. %endif %patch2 -p0 -b .translation +## Remove Utilities from .desktop file, so it will use Settings as main category +sed -i -e 's/Utility;//' share/applications/%{name}.desktop + %build make make update-mo @@ -163,6 +166,9 @@ fi %changelog +* Tue Oct 06 2015 Ding-Yi Chen - 2.10-2 +- Remove Utilities from .desktop file, so it will use Settings as main category. + * Tue Oct 06 2015 Ding-Yi Chen - 2.10-1 - Upstream update to 2.10. From d12496a9c16a9b81e565535585f5bb23175f4ec9 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Wed, 7 Oct 2015 10:12:09 +1000 Subject: [PATCH 10/36] Correct release number --- 0install.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0install.spec b/0install.spec index 5c755ee..55cb12c 100644 --- a/0install.spec +++ b/0install.spec @@ -2,7 +2,7 @@ %global gettext_domain_name zero-install Name: 0install Version: 2.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A decentralized cross-distribution software installation system License: LGPLv2+ From c397724e9931cf4e3046c4118de972b0b09fc723 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 15:16:08 +0000 Subject: [PATCH 11/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- 0install.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/0install.spec b/0install.spec index 55cb12c..ac6f28f 100644 --- a/0install.spec +++ b/0install.spec @@ -2,7 +2,7 @@ %global gettext_domain_name zero-install Name: 0install Version: 2.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A decentralized cross-distribution software installation system License: LGPLv2+ @@ -166,6 +166,9 @@ fi %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 2.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Oct 06 2015 Ding-Yi Chen - 2.10-2 - Remove Utilities from .desktop file, so it will use Settings as main category. From 65d212d655eaf4de169b3f029e75869837d82b7f Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Mon, 22 Feb 2016 14:22:36 +1000 Subject: [PATCH 12/36] - Upstream update to 2.11. - Exclude ppc64le and ppc --- .gitignore | 1 + 0install.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bcb2ccc..0d7b1a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /0install-2.6.1.tar.bz2 /0install-2.9.1.tar.bz2 /0install-2.10.tar.bz2 +/0install-2.11.tar.bz2 diff --git a/0install.spec b/0install.spec index ac6f28f..c3142b3 100644 --- a/0install.spec +++ b/0install.spec @@ -1,8 +1,8 @@ %global cache_dir /var/cache/0install.net %global gettext_domain_name zero-install Name: 0install -Version: 2.10 -Release: 3%{?dist} +Version: 2.11 +Release: 1%{?dist} Summary: A decentralized cross-distribution software installation system License: LGPLv2+ @@ -39,13 +39,16 @@ Requires(pre): shadow-utils # for icons Requires: hicolor-icon-theme +# ocaml-ext-devel is missing +ExcludeArch: ppc64 ppc64le + %if 0%{?epel} # Explict require ocaml-react-devel, otherwise # ocamlfind: Package `lwt.react' not found BuildRequires: ocaml-react-devel -ExcludeArch: ppc64 %endif + Provides: zeroinstall-injector = %{version}-%{release} Obsoletes: zeroinstall-injector < 2.4-1%{?dist} @@ -166,6 +169,10 @@ fi %changelog +* Mon Feb 22 2016 Ding-Yi Chen - 2.11-1 +- Upstream update to 2.11. +- Exclude ppc64le and ppc + * Wed Feb 03 2016 Fedora Release Engineering - 2.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 477831d..2de9b50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3db5bca7df2c01f9c74e57b503d9dd39 0install-2.10.tar.bz2 +1cfe5845bf20fd0c0253c8ca6da7f37e 0install-2.11.tar.bz2 From eada4fcbf317b40291e31c251409f6fb13d83f8a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 7 Nov 2016 20:43:17 +0000 Subject: [PATCH 13/36] Rebuild for OCaml 4.04.0. --- 0install.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/0install.spec b/0install.spec index c3142b3..d5506d7 100644 --- a/0install.spec +++ b/0install.spec @@ -2,7 +2,7 @@ %global gettext_domain_name zero-install Name: 0install Version: 2.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A decentralized cross-distribution software installation system License: LGPLv2+ @@ -169,6 +169,9 @@ fi %changelog +* Mon Nov 07 2016 Richard W.M. Jones - 2.11-2 +- Rebuild for OCaml 4.04.0. + * Mon Feb 22 2016 Ding-Yi Chen - 2.11-1 - Upstream update to 2.11. - Exclude ppc64le and ppc From a396ac5de07f244ee2a6222daa5e5d0ed1a3154a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 7 Nov 2016 20:50:04 +0000 Subject: [PATCH 14/36] Add explicit dependency on ocamlbuild. --- 0install.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/0install.spec b/0install.spec index d5506d7..610e51f 100644 --- a/0install.spec +++ b/0install.spec @@ -25,6 +25,7 @@ BuildRequires: ocaml-lablgtk-devel BuildRequires: ocaml-lwt-devel # not packaged yet, optional # BuildRequires: ocaml-obus-devel +BuildRequires: ocaml-ocamlbuild BuildRequires: ocaml-ounit-devel BuildRequires: ocaml-ssl-devel BuildRequires: ocaml-xmlm-devel @@ -171,6 +172,7 @@ fi %changelog * Mon Nov 07 2016 Richard W.M. Jones - 2.11-2 - Rebuild for OCaml 4.04.0. +- Add explicit dependency on ocamlbuild. * Mon Feb 22 2016 Ding-Yi Chen - 2.11-1 - Upstream update to 2.11. From 9aa366e098df90964d7423f78bb91800ee9a5339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Wed, 9 Nov 2016 18:57:04 +0100 Subject: [PATCH 15/36] - rebuild for s390x codegen bug --- 0install.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/0install.spec b/0install.spec index 610e51f..7e5fb63 100644 --- a/0install.spec +++ b/0install.spec @@ -2,7 +2,7 @@ %global gettext_domain_name zero-install Name: 0install Version: 2.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A decentralized cross-distribution software installation system License: LGPLv2+ @@ -170,6 +170,9 @@ fi %changelog +* Wed Nov 09 2016 Dan Horák - 2.11-3 +- rebuild for s390x codegen bug + * Mon Nov 07 2016 Richard W.M. Jones - 2.11-2 - Rebuild for OCaml 4.04.0. - Add explicit dependency on ocamlbuild. From a57f128db49d51de35ad5f6303c4c9a932e33823 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 04:56:03 +0000 Subject: [PATCH 16/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- 0install.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/0install.spec b/0install.spec index 7e5fb63..dfcfaee 100644 --- a/0install.spec +++ b/0install.spec @@ -2,7 +2,7 @@ %global gettext_domain_name zero-install Name: 0install Version: 2.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A decentralized cross-distribution software installation system License: LGPLv2+ @@ -170,6 +170,9 @@ fi %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Nov 09 2016 Dan Horák - 2.11-3 - rebuild for s390x codegen bug From 1971f017e8b7986554e1831e14ecddbc3bab17a8 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Wed, 29 Mar 2017 13:45:39 +1000 Subject: [PATCH 17/36] Upstream update to 2.12.1 --- .gitignore | 1 + 0install.spec | 15 ++++++++++----- sources | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 0d7b1a5..3cb01e8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /0install-2.9.1.tar.bz2 /0install-2.10.tar.bz2 /0install-2.11.tar.bz2 +/0install-2.12.1.tar.bz2 diff --git a/0install.spec b/0install.spec index dfcfaee..b3c4770 100644 --- a/0install.spec +++ b/0install.spec @@ -1,8 +1,8 @@ %global cache_dir /var/cache/0install.net %global gettext_domain_name zero-install Name: 0install -Version: 2.11 -Release: 4%{?dist} +Version: 2.12.1 +Release: 1%{?dist} Summary: A decentralized cross-distribution software installation system License: LGPLv2+ @@ -14,12 +14,12 @@ Patch0: %{name}-2.6-no-tests.patch Patch1: %{name}-2.9.1-lib64.patch Patch2: %{name}-2.10-makefile.patch -BuildRequires: ocaml >= 3.10.0 +BuildRequires: ocaml >= 4.02.3 BuildRequires: ocaml-biniou-devel BuildRequires: ocaml-easy-format-devel BuildRequires: ocaml-findlib BuildRequires: ocaml-camlp4-devel -BuildRequires: ocaml-curl-devel +BuildRequires: ocaml-curl-devel >= 0.7.9 BuildRequires: ocaml-extlib-devel BuildRequires: ocaml-lablgtk-devel BuildRequires: ocaml-lwt-devel @@ -44,7 +44,7 @@ Requires: hicolor-icon-theme ExcludeArch: ppc64 ppc64le %if 0%{?epel} -# Explict require ocaml-react-devel, otherwise +# Explict require ocaml-react-devel, otherwise # ocamlfind: Package `lwt.react' not found BuildRequires: ocaml-react-devel %endif @@ -170,6 +170,11 @@ fi %changelog +* Wed Mar 29 2017 Ding-Yi Chen - 2.12.1-1 +- Drop support for OCaml 4.01 +- Work around buggy GnuPG 2.1.16 +- Update dependencies + * Fri Feb 10 2017 Fedora Release Engineering - 2.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 2de9b50..abbcb01 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1cfe5845bf20fd0c0253c8ca6da7f37e 0install-2.11.tar.bz2 +SHA512 (0install-2.12.1.tar.bz2) = 314ecbff2985171bf9dd854166c0b6faf90526a0844e8861cafd7082919aa91d4009e3fad84f06956373997637c927e836aea8093c17b88358283bbc45ad763d From 7c1cb27aa51c0c8bd6b38b12f3ec2c9805dfd434 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 01:35:42 +0000 Subject: [PATCH 18/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- 0install.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/0install.spec b/0install.spec index b3c4770..7ccd4be 100644 --- a/0install.spec +++ b/0install.spec @@ -2,7 +2,7 @@ %global gettext_domain_name zero-install Name: 0install Version: 2.12.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A decentralized cross-distribution software installation system License: LGPLv2+ @@ -170,6 +170,9 @@ fi %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Mar 29 2017 Ding-Yi Chen - 2.12.1-1 - Drop support for OCaml 4.01 - Work around buggy GnuPG 2.1.16 From 6025c72d778ba6c339a0cc8bfd16a1c4ec290c9e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 16:44:39 +0000 Subject: [PATCH 19/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- 0install.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/0install.spec b/0install.spec index 7ccd4be..e2ec5db 100644 --- a/0install.spec +++ b/0install.spec @@ -2,7 +2,7 @@ %global gettext_domain_name zero-install Name: 0install Version: 2.12.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A decentralized cross-distribution software installation system License: LGPLv2+ @@ -170,6 +170,9 @@ fi %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 2.12.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.12.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 8ca95ab9cec445cc1bd5f41a3d07ce206cb5c55e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 7 Jan 2018 18:57:26 +0100 Subject: [PATCH 20/36] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- 0install.spec | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/0install.spec b/0install.spec index e2ec5db..ff0a858 100644 --- a/0install.spec +++ b/0install.spec @@ -2,7 +2,7 @@ %global gettext_domain_name zero-install Name: 0install Version: 2.12.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A decentralized cross-distribution software installation system License: LGPLv2+ @@ -134,18 +134,6 @@ useradd -r -g zeroinst -d %{cache_dir} -s /sbin/nologin \ -c "Zero Install shared cache" zeroinst exit 0 -%post -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - %files -f %{gettext_domain_name}.lang %doc COPYING README.md @@ -170,6 +158,9 @@ fi %changelog +* Sun Jan 07 2018 Igor Gnatenko - 2.12.1-4 +- Remove obsolete scriptlets + * Wed Aug 02 2017 Fedora Release Engineering - 2.12.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 6e5d215be50fa820f65a3869c2a036bc2a105083 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 00:19:00 +0000 Subject: [PATCH 21/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 0install.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/0install.spec b/0install.spec index ff0a858..30f38ac 100644 --- a/0install.spec +++ b/0install.spec @@ -2,7 +2,7 @@ %global gettext_domain_name zero-install Name: 0install Version: 2.12.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A decentralized cross-distribution software installation system License: LGPLv2+ @@ -158,6 +158,9 @@ exit 0 %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.12.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sun Jan 07 2018 Igor Gnatenko - 2.12.1-4 - Remove obsolete scriptlets From 799666801643f34047828d89b4aee53f5794753f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 18:51:26 +0000 Subject: [PATCH 22/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 0install.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/0install.spec b/0install.spec index 30f38ac..73fcc22 100644 --- a/0install.spec +++ b/0install.spec @@ -2,7 +2,7 @@ %global gettext_domain_name zero-install Name: 0install Version: 2.12.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A decentralized cross-distribution software installation system License: LGPLv2+ @@ -158,6 +158,9 @@ exit 0 %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 2.12.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 2.12.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 4dba5db3aabcfa8b932f19a716d9b80be0f1a6de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 11:17:14 +0000 Subject: [PATCH 23/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 0install.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/0install.spec b/0install.spec index 73fcc22..9a4f77f 100644 --- a/0install.spec +++ b/0install.spec @@ -2,7 +2,7 @@ %global gettext_domain_name zero-install Name: 0install Version: 2.12.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A decentralized cross-distribution software installation system License: LGPLv2+ @@ -158,6 +158,9 @@ exit 0 %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.12.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 2.12.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 196a9ec45bc41630d308db7622c9ccef1af58804 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 15:35:06 +0000 Subject: [PATCH 24/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 0install.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/0install.spec b/0install.spec index 9a4f77f..942f358 100644 --- a/0install.spec +++ b/0install.spec @@ -2,7 +2,7 @@ %global gettext_domain_name zero-install Name: 0install Version: 2.12.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A decentralized cross-distribution software installation system License: LGPLv2+ @@ -158,6 +158,9 @@ exit 0 %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.12.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 2.12.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 86cadb8ea19b4bf59abfe50935a833328f112bd8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Aug 2019 13:25:55 +0000 Subject: [PATCH 25/36] 0install fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674564 --- .gitignore | 5 - 0install-2.10-makefile.patch | 23 ---- 0install-2.6-no-tests.patch | 11 -- 0install-2.9.1-lib64.patch | 34 ----- 0install.spec | 244 ----------------------------------- dead.package | 1 + sources | 1 - 7 files changed, 1 insertion(+), 318 deletions(-) delete mode 100644 .gitignore delete mode 100644 0install-2.10-makefile.patch delete mode 100644 0install-2.6-no-tests.patch delete mode 100644 0install-2.9.1-lib64.patch delete mode 100644 0install.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 3cb01e8..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/0install-2.6.1.tar.bz2 -/0install-2.9.1.tar.bz2 -/0install-2.10.tar.bz2 -/0install-2.11.tar.bz2 -/0install-2.12.1.tar.bz2 diff --git a/0install-2.10-makefile.patch b/0install-2.10-makefile.patch deleted file mode 100644 index f72ca3f..0000000 --- a/0install-2.10-makefile.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up ./Makefile.translation ./Makefile ---- ./Makefile.translation 2015-10-05 00:41:05.000000000 +1000 -+++ ./Makefile 2015-10-06 17:06:42.633307106 +1000 -@@ -54,7 +54,13 @@ default: all - [ -d "${DISTDIR}" ] || mkdir "${DISTDIR}" - $(MAKE) -C "${BUILDDIR}" -f "${SRCDIR}/Makefile.build" "$@" SRCDIR="${SRCDIR}" BUILDDIR="${BUILDDIR}" DISTDIR="${DISTDIR}" DESTDIR="${DESTDIR}" - -+po-files=$(shell find . -name '*.po') -+mo-files=$(subst po,mo,$(po-files)) -+update-mo: ${mo-files} -+ -+ - share/locale/zero-install.pot: $(SH) -+ touch $@ - xgettext --sort-by-file --language=Shell -j --output=$@ $(SH) - - update-po: share/locale/zero-install.pot -@@ -73,4 +79,4 @@ clean: - rm -rf build - rm -rf dist - --.PHONY: update-po check-po clean default -+.PHONY: update-po update-mo check-po clean default diff --git a/0install-2.6-no-tests.patch b/0install-2.6-no-tests.patch deleted file mode 100644 index d5aeaa7..0000000 --- a/0install-2.6-no-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 0install-2.6/ocaml/Makefile.no-tests 2014-01-20 01:49:14.000000000 +0700 -+++ 0install-2.6/ocaml/Makefile 2014-01-20 19:23:48.945070803 +0700 -@@ -11,7 +11,7 @@ - - .PHONY: all ocaml doc clean tags test - --all: build_dir ocaml test -+all: build_dir ocaml - - build_dir: - [ -d "${OCAML_BUILDDIR}" ] || mkdir -p "${OCAML_BUILDDIR}" diff --git a/0install-2.9.1-lib64.patch b/0install-2.9.1-lib64.patch deleted file mode 100644 index 76b11a4..0000000 --- a/0install-2.9.1-lib64.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up ./install.sh.src.orig ./install.sh.src ---- ./install.sh.src.orig 2015-09-02 14:39:32.011146045 +1000 -+++ ./install.sh.src 2015-09-02 14:40:31.756148173 +1000 -@@ -76,7 +76,7 @@ install -d "$DESTDIR${PREFIX_SHARE}/bash - install -d "$DESTDIR${PREFIX_SHARE}/fish/completions" - install -d "$DESTDIR${PREFIX_SHARE}/doc/0install" - install -d "$DESTDIR${PREFIX}/${ZSHFUNCTIONS}" --install -d "$DESTDIR${PREFIX}/lib/0install.net" -+install -d "$DESTDIR${PREFIX}/lib64/0install.net" - - install -m 0644 ${DOCS} "$DESTDIR${PREFIX_SHARE}/doc/0install/" - install -m 0644 ${MANPAGES} "$DESTDIR${PREFIX_MAN}/man1/" -@@ -93,7 +93,7 @@ install -m 0755 share/0install.net/unlzm - install -m 0755 share/0install.net/unxz "$DESTDIR${PREFIX_SHARE}/0install.net/" - - if [ -n "$PLUGINS" ]; then -- install -m 0644 $PLUGINS "$DESTDIR${PREFIX}/lib/0install.net/" -+ install -m 0644 $PLUGINS "$DESTDIR${PREFIX}/lib64/0install.net/" - fi - - for size in 24x24 48x48 128x128 scalable; do \ -diff -up ./ocaml/Makefile.orig ./ocaml/Makefile -diff -up ./ocaml/zeroinstall/gui.ml.orig ./ocaml/zeroinstall/gui.ml ---- ./ocaml/zeroinstall/gui.ml.orig 2015-09-02 14:32:01.260129993 +1000 -+++ ./ocaml/zeroinstall/gui.ml 2015-09-02 14:34:51.351136051 +1000 -@@ -337,7 +337,7 @@ let try_get_gui config ~use_gui = - if system#file_exists plugin_path then Some plugin_path else None in - - let plugin_path = -- let sys_lib = Filename.dirname bindir +/ "lib" in -+ let sys_lib = Filename.dirname bindir +/ "lib64" in - U.first_match check_plugin_dir [ - (* Was 0install installed with opam? *) - sys_lib +/ "0install"; diff --git a/0install.spec b/0install.spec deleted file mode 100644 index 942f358..0000000 --- a/0install.spec +++ /dev/null @@ -1,244 +0,0 @@ -%global cache_dir /var/cache/0install.net -%global gettext_domain_name zero-install -Name: 0install -Version: 2.12.1 -Release: 8%{?dist} -Summary: A decentralized cross-distribution software installation system - -License: LGPLv2+ -URL: http://0install.net -Source0: http://downloads.sf.net/project/zero-install/%{name}/%{version}/%{name}-%{version}.tar.bz2 -# Temporarily disable tests, some failures within mock env -Patch0: %{name}-2.6-no-tests.patch -# multilib: use lib64 instead of lib on 64-bit arches -Patch1: %{name}-2.9.1-lib64.patch -Patch2: %{name}-2.10-makefile.patch - -BuildRequires: ocaml >= 4.02.3 -BuildRequires: ocaml-biniou-devel -BuildRequires: ocaml-easy-format-devel -BuildRequires: ocaml-findlib -BuildRequires: ocaml-camlp4-devel -BuildRequires: ocaml-curl-devel >= 0.7.9 -BuildRequires: ocaml-extlib-devel -BuildRequires: ocaml-lablgtk-devel -BuildRequires: ocaml-lwt-devel -# not packaged yet, optional -# BuildRequires: ocaml-obus-devel -BuildRequires: ocaml-ocamlbuild -BuildRequires: ocaml-ounit-devel -BuildRequires: ocaml-ssl-devel -BuildRequires: ocaml-xmlm-devel -BuildRequires: ocaml-yojson-devel -BuildRequires: glib2-devel -BuildRequires: libev-devel -BuildRequires: gettext -BuildRequires: desktop-file-utils - -Requires(pre): shadow-utils - -# for icons -Requires: hicolor-icon-theme - -# ocaml-ext-devel is missing -ExcludeArch: ppc64 ppc64le - -%if 0%{?epel} -# Explict require ocaml-react-devel, otherwise -# ocamlfind: Package `lwt.react' not found -BuildRequires: ocaml-react-devel -%endif - - -Provides: zeroinstall-injector = %{version}-%{release} -Obsoletes: zeroinstall-injector < 2.4-1%{?dist} - -%description -Zero Install is a decentralized cross-distribution software -installation system available under the LGPL. It allows software -developers to publish programs directly from their own web-sites, -while supporting features familiar from centralized distribution -repositories such as shared libraries, automatic updates and digital -signatures. It is intended to complement, rather than replace, the -operating system's package management. 0install packages never -interfere with those provided by the distribution. - -0install does not define a new packaging format; unmodified tarballs -or zip archives can be used. Instead, it defines an XML metadata -format to describe these packages and the dependencies between them. A -single metadata file can be used on multiple platforms (e.g. Ubuntu, -Debian, Fedora, openSUSE, Mac OS X and Windows), assuming binary or -source archives are available that work on those systems. - -0install also has some interesting features not often found in -traditional package managers. For example, while it will share -libraries whenever possible, it can always install multiple versions -of a package in parallel when there are conflicting -requirements. Installation is always side-effect-free (each package is -unpacked to its own directory and will not touch shared directories -such as /usr/bin), making it ideal for use with sandboxing -technologies and virtualization. - -The XML file describing the program's requirements can also be -included in a source-code repository, allowing full dependency -handling for unreleased developer versions. For example, a user can -clone a Git repository and build and test the program, automatically -downloading newer versions of libraries where necessary, without -interfering with the versions of those libraries installed by their -distribution, which continue to be used for other software. - - -%prep -%setup -q -%patch0 -p1 -b .no-tests -%if "%{_lib}" == "lib64" -%patch1 -p0 -b .lib64 -%endif -%patch2 -p0 -b .translation - -## Remove Utilities from .desktop file, so it will use Settings as main category -sed -i -e 's/Utility;//' share/applications/%{name}.desktop - -%build -make -make update-mo - - -%install -make install_system DESTDIR=$RPM_BUILD_ROOT - -# fix permission of shared objects -chmod +x $RPM_BUILD_ROOT%{_libdir}/0install.net/gui_gtk.cmxs - -mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations" - -desktop-file-validate \ - $RPM_BUILD_ROOT%{_datadir}/applications/0install.desktop - -## Copy mo files -mkdir -p %{buildroot}%{_datadir}/locale -cp -R build/share/locale/* %{buildroot}%{_datadir}/locale - -%find_lang %{gettext_domain_name} - -## Remove excess doc -rm -fr %{buildroot}/usr/share/doc/%{name} - -%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 %{gettext_domain_name}.lang -%doc COPYING README.md -%{_bindir}/0* -%{_libdir}/0install.net -%{_datadir}/0install.net -%{_datadir}/appdata/0install* -%{_datadir}/applications/0install.desktop -%{_datadir}/icons/hicolor/*/apps/zeroinstall.* -%dir %{_datadir}/bash-completion -%dir %{_datadir}/bash-completion/completions -%{_datadir}/bash-completion/completions/0* -%dir %{_datadir}/fish -%dir %{_datadir}/fish/completions -%{_datadir}/fish/completions/0*.fish -%dir %{_datadir}/zsh -%dir %{_datadir}/zsh/site-functions -%{_datadir}/zsh/site-functions/_0* -%{_mandir}/man1/0* -%dir %{cache_dir} -%attr(755,zeroinst,zeroinst) %{cache_dir}/implementations - - -%changelog -* Wed Jul 24 2019 Fedora Release Engineering - 2.12.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 2.12.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 2.12.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 2.12.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Jan 07 2018 Igor Gnatenko - 2.12.1-4 -- Remove obsolete scriptlets - -* Wed Aug 02 2017 Fedora Release Engineering - 2.12.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.12.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Mar 29 2017 Ding-Yi Chen - 2.12.1-1 -- Drop support for OCaml 4.01 -- Work around buggy GnuPG 2.1.16 -- Update dependencies - -* Fri Feb 10 2017 Fedora Release Engineering - 2.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Nov 09 2016 Dan Horák - 2.11-3 -- rebuild for s390x codegen bug - -* Mon Nov 07 2016 Richard W.M. Jones - 2.11-2 -- Rebuild for OCaml 4.04.0. -- Add explicit dependency on ocamlbuild. - -* Mon Feb 22 2016 Ding-Yi Chen - 2.11-1 -- Upstream update to 2.11. -- Exclude ppc64le and ppc - -* Wed Feb 03 2016 Fedora Release Engineering - 2.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Oct 06 2015 Ding-Yi Chen - 2.10-2 -- Remove Utilities from .desktop file, so it will use Settings as main category. - -* Tue Oct 06 2015 Ding-Yi Chen - 2.10-1 -- Upstream update to 2.10. - -* Thu Oct 01 2015 Ding-Yi Chen - 2.9.1-1 -- Upstream update to 2.9.1. -- Add buildrequires: ocaml-react-devel for EPEL. -- Exclude ppc64 for EPEL, as the build dependency ocaml-findlib-devel is not available on it. - -* Tue Jun 16 2015 Fedora Release Engineering - 2.6.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Aug 15 2014 Fedora Release Engineering - 2.6.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jun 06 2014 Dennis Gilmore - 2.6.1-4 -- Remove the no longer needed ExclusiveArch line the macro used has been removed - -* Fri Jun 06 2014 Fedora Release Engineering - 2.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Feb 15 2014 Michel Salim - 2.6.1-2 -- Spec clean-up -- Fix permission of shared objects so they get properly handled when - generating debuginfo - -* Fri Feb 14 2014 Michel Salim - 2.6.1-1 -- Update to 2.6.1 -- Install to proper libdir depending on the actual architecture -- Fix ExclusiveArch, build requirements and obsoletion -- Fix license tag -- Yank old changelog from zero-install - -* Mon Jan 20 2014 Michel Salim - 2.6-1 -- Update to 2.6 - -* Mon Jan 20 2014 Michel Salim - 2.5.1-1 -- Rename package to 0install -- Update to 2.5.1 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a3d3c4f --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +0install fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674564 diff --git a/sources b/sources deleted file mode 100644 index abbcb01..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (0install-2.12.1.tar.bz2) = 314ecbff2985171bf9dd854166c0b6faf90526a0844e8861cafd7082919aa91d4009e3fad84f06956373997637c927e836aea8093c17b88358283bbc45ad763d From e526d584dd7036256734ca605aafdef4163ae453 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 16 Jul 2024 19:13:03 +0000 Subject: [PATCH 26/36] Revert "0install fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674564" Unretirement request: pagure.io/releng/issue/12205 This reverts commit 86cadb8ea19b4bf59abfe50935a833328f112bd8. Signed-off-by: Fedora Release Engineering --- .gitignore | 5 + 0install-2.10-makefile.patch | 23 ++++ 0install-2.6-no-tests.patch | 11 ++ 0install-2.9.1-lib64.patch | 34 +++++ 0install.spec | 244 +++++++++++++++++++++++++++++++++++ dead.package | 1 - sources | 1 + 7 files changed, 318 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 0install-2.10-makefile.patch create mode 100644 0install-2.6-no-tests.patch create mode 100644 0install-2.9.1-lib64.patch create mode 100644 0install.spec delete mode 100644 dead.package create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3cb01e8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +/0install-2.6.1.tar.bz2 +/0install-2.9.1.tar.bz2 +/0install-2.10.tar.bz2 +/0install-2.11.tar.bz2 +/0install-2.12.1.tar.bz2 diff --git a/0install-2.10-makefile.patch b/0install-2.10-makefile.patch new file mode 100644 index 0000000..f72ca3f --- /dev/null +++ b/0install-2.10-makefile.patch @@ -0,0 +1,23 @@ +diff -up ./Makefile.translation ./Makefile +--- ./Makefile.translation 2015-10-05 00:41:05.000000000 +1000 ++++ ./Makefile 2015-10-06 17:06:42.633307106 +1000 +@@ -54,7 +54,13 @@ default: all + [ -d "${DISTDIR}" ] || mkdir "${DISTDIR}" + $(MAKE) -C "${BUILDDIR}" -f "${SRCDIR}/Makefile.build" "$@" SRCDIR="${SRCDIR}" BUILDDIR="${BUILDDIR}" DISTDIR="${DISTDIR}" DESTDIR="${DESTDIR}" + ++po-files=$(shell find . -name '*.po') ++mo-files=$(subst po,mo,$(po-files)) ++update-mo: ${mo-files} ++ ++ + share/locale/zero-install.pot: $(SH) ++ touch $@ + xgettext --sort-by-file --language=Shell -j --output=$@ $(SH) + + update-po: share/locale/zero-install.pot +@@ -73,4 +79,4 @@ clean: + rm -rf build + rm -rf dist + +-.PHONY: update-po check-po clean default ++.PHONY: update-po update-mo check-po clean default diff --git a/0install-2.6-no-tests.patch b/0install-2.6-no-tests.patch new file mode 100644 index 0000000..d5aeaa7 --- /dev/null +++ b/0install-2.6-no-tests.patch @@ -0,0 +1,11 @@ +--- 0install-2.6/ocaml/Makefile.no-tests 2014-01-20 01:49:14.000000000 +0700 ++++ 0install-2.6/ocaml/Makefile 2014-01-20 19:23:48.945070803 +0700 +@@ -11,7 +11,7 @@ + + .PHONY: all ocaml doc clean tags test + +-all: build_dir ocaml test ++all: build_dir ocaml + + build_dir: + [ -d "${OCAML_BUILDDIR}" ] || mkdir -p "${OCAML_BUILDDIR}" diff --git a/0install-2.9.1-lib64.patch b/0install-2.9.1-lib64.patch new file mode 100644 index 0000000..76b11a4 --- /dev/null +++ b/0install-2.9.1-lib64.patch @@ -0,0 +1,34 @@ +diff -up ./install.sh.src.orig ./install.sh.src +--- ./install.sh.src.orig 2015-09-02 14:39:32.011146045 +1000 ++++ ./install.sh.src 2015-09-02 14:40:31.756148173 +1000 +@@ -76,7 +76,7 @@ install -d "$DESTDIR${PREFIX_SHARE}/bash + install -d "$DESTDIR${PREFIX_SHARE}/fish/completions" + install -d "$DESTDIR${PREFIX_SHARE}/doc/0install" + install -d "$DESTDIR${PREFIX}/${ZSHFUNCTIONS}" +-install -d "$DESTDIR${PREFIX}/lib/0install.net" ++install -d "$DESTDIR${PREFIX}/lib64/0install.net" + + install -m 0644 ${DOCS} "$DESTDIR${PREFIX_SHARE}/doc/0install/" + install -m 0644 ${MANPAGES} "$DESTDIR${PREFIX_MAN}/man1/" +@@ -93,7 +93,7 @@ install -m 0755 share/0install.net/unlzm + install -m 0755 share/0install.net/unxz "$DESTDIR${PREFIX_SHARE}/0install.net/" + + if [ -n "$PLUGINS" ]; then +- install -m 0644 $PLUGINS "$DESTDIR${PREFIX}/lib/0install.net/" ++ install -m 0644 $PLUGINS "$DESTDIR${PREFIX}/lib64/0install.net/" + fi + + for size in 24x24 48x48 128x128 scalable; do \ +diff -up ./ocaml/Makefile.orig ./ocaml/Makefile +diff -up ./ocaml/zeroinstall/gui.ml.orig ./ocaml/zeroinstall/gui.ml +--- ./ocaml/zeroinstall/gui.ml.orig 2015-09-02 14:32:01.260129993 +1000 ++++ ./ocaml/zeroinstall/gui.ml 2015-09-02 14:34:51.351136051 +1000 +@@ -337,7 +337,7 @@ let try_get_gui config ~use_gui = + if system#file_exists plugin_path then Some plugin_path else None in + + let plugin_path = +- let sys_lib = Filename.dirname bindir +/ "lib" in ++ let sys_lib = Filename.dirname bindir +/ "lib64" in + U.first_match check_plugin_dir [ + (* Was 0install installed with opam? *) + sys_lib +/ "0install"; diff --git a/0install.spec b/0install.spec new file mode 100644 index 0000000..942f358 --- /dev/null +++ b/0install.spec @@ -0,0 +1,244 @@ +%global cache_dir /var/cache/0install.net +%global gettext_domain_name zero-install +Name: 0install +Version: 2.12.1 +Release: 8%{?dist} +Summary: A decentralized cross-distribution software installation system + +License: LGPLv2+ +URL: http://0install.net +Source0: http://downloads.sf.net/project/zero-install/%{name}/%{version}/%{name}-%{version}.tar.bz2 +# Temporarily disable tests, some failures within mock env +Patch0: %{name}-2.6-no-tests.patch +# multilib: use lib64 instead of lib on 64-bit arches +Patch1: %{name}-2.9.1-lib64.patch +Patch2: %{name}-2.10-makefile.patch + +BuildRequires: ocaml >= 4.02.3 +BuildRequires: ocaml-biniou-devel +BuildRequires: ocaml-easy-format-devel +BuildRequires: ocaml-findlib +BuildRequires: ocaml-camlp4-devel +BuildRequires: ocaml-curl-devel >= 0.7.9 +BuildRequires: ocaml-extlib-devel +BuildRequires: ocaml-lablgtk-devel +BuildRequires: ocaml-lwt-devel +# not packaged yet, optional +# BuildRequires: ocaml-obus-devel +BuildRequires: ocaml-ocamlbuild +BuildRequires: ocaml-ounit-devel +BuildRequires: ocaml-ssl-devel +BuildRequires: ocaml-xmlm-devel +BuildRequires: ocaml-yojson-devel +BuildRequires: glib2-devel +BuildRequires: libev-devel +BuildRequires: gettext +BuildRequires: desktop-file-utils + +Requires(pre): shadow-utils + +# for icons +Requires: hicolor-icon-theme + +# ocaml-ext-devel is missing +ExcludeArch: ppc64 ppc64le + +%if 0%{?epel} +# Explict require ocaml-react-devel, otherwise +# ocamlfind: Package `lwt.react' not found +BuildRequires: ocaml-react-devel +%endif + + +Provides: zeroinstall-injector = %{version}-%{release} +Obsoletes: zeroinstall-injector < 2.4-1%{?dist} + +%description +Zero Install is a decentralized cross-distribution software +installation system available under the LGPL. It allows software +developers to publish programs directly from their own web-sites, +while supporting features familiar from centralized distribution +repositories such as shared libraries, automatic updates and digital +signatures. It is intended to complement, rather than replace, the +operating system's package management. 0install packages never +interfere with those provided by the distribution. + +0install does not define a new packaging format; unmodified tarballs +or zip archives can be used. Instead, it defines an XML metadata +format to describe these packages and the dependencies between them. A +single metadata file can be used on multiple platforms (e.g. Ubuntu, +Debian, Fedora, openSUSE, Mac OS X and Windows), assuming binary or +source archives are available that work on those systems. + +0install also has some interesting features not often found in +traditional package managers. For example, while it will share +libraries whenever possible, it can always install multiple versions +of a package in parallel when there are conflicting +requirements. Installation is always side-effect-free (each package is +unpacked to its own directory and will not touch shared directories +such as /usr/bin), making it ideal for use with sandboxing +technologies and virtualization. + +The XML file describing the program's requirements can also be +included in a source-code repository, allowing full dependency +handling for unreleased developer versions. For example, a user can +clone a Git repository and build and test the program, automatically +downloading newer versions of libraries where necessary, without +interfering with the versions of those libraries installed by their +distribution, which continue to be used for other software. + + +%prep +%setup -q +%patch0 -p1 -b .no-tests +%if "%{_lib}" == "lib64" +%patch1 -p0 -b .lib64 +%endif +%patch2 -p0 -b .translation + +## Remove Utilities from .desktop file, so it will use Settings as main category +sed -i -e 's/Utility;//' share/applications/%{name}.desktop + +%build +make +make update-mo + + +%install +make install_system DESTDIR=$RPM_BUILD_ROOT + +# fix permission of shared objects +chmod +x $RPM_BUILD_ROOT%{_libdir}/0install.net/gui_gtk.cmxs + +mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations" + +desktop-file-validate \ + $RPM_BUILD_ROOT%{_datadir}/applications/0install.desktop + +## Copy mo files +mkdir -p %{buildroot}%{_datadir}/locale +cp -R build/share/locale/* %{buildroot}%{_datadir}/locale + +%find_lang %{gettext_domain_name} + +## Remove excess doc +rm -fr %{buildroot}/usr/share/doc/%{name} + +%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 %{gettext_domain_name}.lang +%doc COPYING README.md +%{_bindir}/0* +%{_libdir}/0install.net +%{_datadir}/0install.net +%{_datadir}/appdata/0install* +%{_datadir}/applications/0install.desktop +%{_datadir}/icons/hicolor/*/apps/zeroinstall.* +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions +%{_datadir}/bash-completion/completions/0* +%dir %{_datadir}/fish +%dir %{_datadir}/fish/completions +%{_datadir}/fish/completions/0*.fish +%dir %{_datadir}/zsh +%dir %{_datadir}/zsh/site-functions +%{_datadir}/zsh/site-functions/_0* +%{_mandir}/man1/0* +%dir %{cache_dir} +%attr(755,zeroinst,zeroinst) %{cache_dir}/implementations + + +%changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.12.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 2.12.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 2.12.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 2.12.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Jan 07 2018 Igor Gnatenko - 2.12.1-4 +- Remove obsolete scriptlets + +* Wed Aug 02 2017 Fedora Release Engineering - 2.12.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Mar 29 2017 Ding-Yi Chen - 2.12.1-1 +- Drop support for OCaml 4.01 +- Work around buggy GnuPG 2.1.16 +- Update dependencies + +* Fri Feb 10 2017 Fedora Release Engineering - 2.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Nov 09 2016 Dan Horák - 2.11-3 +- rebuild for s390x codegen bug + +* Mon Nov 07 2016 Richard W.M. Jones - 2.11-2 +- Rebuild for OCaml 4.04.0. +- Add explicit dependency on ocamlbuild. + +* Mon Feb 22 2016 Ding-Yi Chen - 2.11-1 +- Upstream update to 2.11. +- Exclude ppc64le and ppc + +* Wed Feb 03 2016 Fedora Release Engineering - 2.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Oct 06 2015 Ding-Yi Chen - 2.10-2 +- Remove Utilities from .desktop file, so it will use Settings as main category. + +* Tue Oct 06 2015 Ding-Yi Chen - 2.10-1 +- Upstream update to 2.10. + +* Thu Oct 01 2015 Ding-Yi Chen - 2.9.1-1 +- Upstream update to 2.9.1. +- Add buildrequires: ocaml-react-devel for EPEL. +- Exclude ppc64 for EPEL, as the build dependency ocaml-findlib-devel is not available on it. + +* Tue Jun 16 2015 Fedora Release Engineering - 2.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Aug 15 2014 Fedora Release Engineering - 2.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Jun 06 2014 Dennis Gilmore - 2.6.1-4 +- Remove the no longer needed ExclusiveArch line the macro used has been removed + +* Fri Jun 06 2014 Fedora Release Engineering - 2.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Feb 15 2014 Michel Salim - 2.6.1-2 +- Spec clean-up +- Fix permission of shared objects so they get properly handled when + generating debuginfo + +* Fri Feb 14 2014 Michel Salim - 2.6.1-1 +- Update to 2.6.1 +- Install to proper libdir depending on the actual architecture +- Fix ExclusiveArch, build requirements and obsoletion +- Fix license tag +- Yank old changelog from zero-install + +* Mon Jan 20 2014 Michel Salim - 2.6-1 +- Update to 2.6 + +* Mon Jan 20 2014 Michel Salim - 2.5.1-1 +- Rename package to 0install +- Update to 2.5.1 diff --git a/dead.package b/dead.package deleted file mode 100644 index a3d3c4f..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -0install fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1674564 diff --git a/sources b/sources new file mode 100644 index 0000000..abbcb01 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (0install-2.12.1.tar.bz2) = 314ecbff2985171bf9dd854166c0b6faf90526a0844e8861cafd7082919aa91d4009e3fad84f06956373997637c927e836aea8093c17b88358283bbc45ad763d From b934739615ad070038bf31037733a0f64290f4b3 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 17 Jul 2024 10:46:46 -0600 Subject: [PATCH 27/36] Convert to %autorelease and %autochangelog [skip changelog] --- 0install.spec | 87 ++------------------------------------------------- changelog | 84 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 85 deletions(-) create mode 100644 changelog diff --git a/0install.spec b/0install.spec index 942f358..8cde279 100644 --- a/0install.spec +++ b/0install.spec @@ -2,7 +2,7 @@ %global gettext_domain_name zero-install Name: 0install Version: 2.12.1 -Release: 8%{?dist} +Release: %autorelease Summary: A decentralized cross-distribution software installation system License: LGPLv2+ @@ -158,87 +158,4 @@ exit 0 %changelog -* Wed Jul 24 2019 Fedora Release Engineering - 2.12.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 2.12.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 2.12.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 2.12.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Jan 07 2018 Igor Gnatenko - 2.12.1-4 -- Remove obsolete scriptlets - -* Wed Aug 02 2017 Fedora Release Engineering - 2.12.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.12.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Mar 29 2017 Ding-Yi Chen - 2.12.1-1 -- Drop support for OCaml 4.01 -- Work around buggy GnuPG 2.1.16 -- Update dependencies - -* Fri Feb 10 2017 Fedora Release Engineering - 2.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Nov 09 2016 Dan Horák - 2.11-3 -- rebuild for s390x codegen bug - -* Mon Nov 07 2016 Richard W.M. Jones - 2.11-2 -- Rebuild for OCaml 4.04.0. -- Add explicit dependency on ocamlbuild. - -* Mon Feb 22 2016 Ding-Yi Chen - 2.11-1 -- Upstream update to 2.11. -- Exclude ppc64le and ppc - -* Wed Feb 03 2016 Fedora Release Engineering - 2.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Oct 06 2015 Ding-Yi Chen - 2.10-2 -- Remove Utilities from .desktop file, so it will use Settings as main category. - -* Tue Oct 06 2015 Ding-Yi Chen - 2.10-1 -- Upstream update to 2.10. - -* Thu Oct 01 2015 Ding-Yi Chen - 2.9.1-1 -- Upstream update to 2.9.1. -- Add buildrequires: ocaml-react-devel for EPEL. -- Exclude ppc64 for EPEL, as the build dependency ocaml-findlib-devel is not available on it. - -* Tue Jun 16 2015 Fedora Release Engineering - 2.6.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Aug 15 2014 Fedora Release Engineering - 2.6.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jun 06 2014 Dennis Gilmore - 2.6.1-4 -- Remove the no longer needed ExclusiveArch line the macro used has been removed - -* Fri Jun 06 2014 Fedora Release Engineering - 2.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Feb 15 2014 Michel Salim - 2.6.1-2 -- Spec clean-up -- Fix permission of shared objects so they get properly handled when - generating debuginfo - -* Fri Feb 14 2014 Michel Salim - 2.6.1-1 -- Update to 2.6.1 -- Install to proper libdir depending on the actual architecture -- Fix ExclusiveArch, build requirements and obsoletion -- Fix license tag -- Yank old changelog from zero-install - -* Mon Jan 20 2014 Michel Salim - 2.6-1 -- Update to 2.6 - -* Mon Jan 20 2014 Michel Salim - 2.5.1-1 -- Rename package to 0install -- Update to 2.5.1 +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..baea8df --- /dev/null +++ b/changelog @@ -0,0 +1,84 @@ +* Wed Jul 24 2019 Fedora Release Engineering - 2.12.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 2.12.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 2.12.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 2.12.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Jan 07 2018 Igor Gnatenko - 2.12.1-4 +- Remove obsolete scriptlets + +* Wed Aug 02 2017 Fedora Release Engineering - 2.12.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Mar 29 2017 Ding-Yi Chen - 2.12.1-1 +- Drop support for OCaml 4.01 +- Work around buggy GnuPG 2.1.16 +- Update dependencies + +* Fri Feb 10 2017 Fedora Release Engineering - 2.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Nov 09 2016 Dan Horák - 2.11-3 +- rebuild for s390x codegen bug + +* Mon Nov 07 2016 Richard W.M. Jones - 2.11-2 +- Rebuild for OCaml 4.04.0. +- Add explicit dependency on ocamlbuild. + +* Mon Feb 22 2016 Ding-Yi Chen - 2.11-1 +- Upstream update to 2.11. +- Exclude ppc64le and ppc + +* Wed Feb 03 2016 Fedora Release Engineering - 2.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Oct 06 2015 Ding-Yi Chen - 2.10-2 +- Remove Utilities from .desktop file, so it will use Settings as main category. + +* Tue Oct 06 2015 Ding-Yi Chen - 2.10-1 +- Upstream update to 2.10. + +* Thu Oct 01 2015 Ding-Yi Chen - 2.9.1-1 +- Upstream update to 2.9.1. +- Add buildrequires: ocaml-react-devel for EPEL. +- Exclude ppc64 for EPEL, as the build dependency ocaml-findlib-devel is not available on it. + +* Tue Jun 16 2015 Fedora Release Engineering - 2.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Aug 15 2014 Fedora Release Engineering - 2.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Jun 06 2014 Dennis Gilmore - 2.6.1-4 +- Remove the no longer needed ExclusiveArch line the macro used has been removed + +* Fri Jun 06 2014 Fedora Release Engineering - 2.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Feb 15 2014 Michel Salim - 2.6.1-2 +- Spec clean-up +- Fix permission of shared objects so they get properly handled when + generating debuginfo + +* Fri Feb 14 2014 Michel Salim - 2.6.1-1 +- Update to 2.6.1 +- Install to proper libdir depending on the actual architecture +- Fix ExclusiveArch, build requirements and obsoletion +- Fix license tag +- Yank old changelog from zero-install + +* Mon Jan 20 2014 Michel Salim - 2.6-1 +- Update to 2.6 + +* Mon Jan 20 2014 Michel Salim - 2.5.1-1 +- Rename package to 0install +- Update to 2.5.1 From 7f52957b192653a30594feef1aadaaf72be7cb16 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 17 Jul 2024 10:48:46 -0600 Subject: [PATCH 28/36] Version 2.18 --- .gitignore | 7 +- 0install-2.10-makefile.patch | 23 --- 0install-2.6-no-tests.patch | 11 -- 0install-2.9.1-lib64.patch | 34 ---- 0install.spec | 193 ++++++------------- 5DD58D70899C454A966D6A5175133C8F94F6E0CC.gpg | Bin 0 -> 4441 bytes README.md | 6 + sources | 3 +- 8 files changed, 67 insertions(+), 210 deletions(-) delete mode 100644 0install-2.10-makefile.patch delete mode 100644 0install-2.6-no-tests.patch delete mode 100644 0install-2.9.1-lib64.patch create mode 100644 5DD58D70899C454A966D6A5175133C8F94F6E0CC.gpg create mode 100644 README.md diff --git a/.gitignore b/.gitignore index 3cb01e8..6102b05 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,2 @@ -/0install-2.6.1.tar.bz2 -/0install-2.9.1.tar.bz2 -/0install-2.10.tar.bz2 -/0install-2.11.tar.bz2 -/0install-2.12.1.tar.bz2 +/0install-*.tbz +/0install-*.tbz.sig diff --git a/0install-2.10-makefile.patch b/0install-2.10-makefile.patch deleted file mode 100644 index f72ca3f..0000000 --- a/0install-2.10-makefile.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up ./Makefile.translation ./Makefile ---- ./Makefile.translation 2015-10-05 00:41:05.000000000 +1000 -+++ ./Makefile 2015-10-06 17:06:42.633307106 +1000 -@@ -54,7 +54,13 @@ default: all - [ -d "${DISTDIR}" ] || mkdir "${DISTDIR}" - $(MAKE) -C "${BUILDDIR}" -f "${SRCDIR}/Makefile.build" "$@" SRCDIR="${SRCDIR}" BUILDDIR="${BUILDDIR}" DISTDIR="${DISTDIR}" DESTDIR="${DESTDIR}" - -+po-files=$(shell find . -name '*.po') -+mo-files=$(subst po,mo,$(po-files)) -+update-mo: ${mo-files} -+ -+ - share/locale/zero-install.pot: $(SH) -+ touch $@ - xgettext --sort-by-file --language=Shell -j --output=$@ $(SH) - - update-po: share/locale/zero-install.pot -@@ -73,4 +79,4 @@ clean: - rm -rf build - rm -rf dist - --.PHONY: update-po check-po clean default -+.PHONY: update-po update-mo check-po clean default diff --git a/0install-2.6-no-tests.patch b/0install-2.6-no-tests.patch deleted file mode 100644 index d5aeaa7..0000000 --- a/0install-2.6-no-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 0install-2.6/ocaml/Makefile.no-tests 2014-01-20 01:49:14.000000000 +0700 -+++ 0install-2.6/ocaml/Makefile 2014-01-20 19:23:48.945070803 +0700 -@@ -11,7 +11,7 @@ - - .PHONY: all ocaml doc clean tags test - --all: build_dir ocaml test -+all: build_dir ocaml - - build_dir: - [ -d "${OCAML_BUILDDIR}" ] || mkdir -p "${OCAML_BUILDDIR}" diff --git a/0install-2.9.1-lib64.patch b/0install-2.9.1-lib64.patch deleted file mode 100644 index 76b11a4..0000000 --- a/0install-2.9.1-lib64.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up ./install.sh.src.orig ./install.sh.src ---- ./install.sh.src.orig 2015-09-02 14:39:32.011146045 +1000 -+++ ./install.sh.src 2015-09-02 14:40:31.756148173 +1000 -@@ -76,7 +76,7 @@ install -d "$DESTDIR${PREFIX_SHARE}/bash - install -d "$DESTDIR${PREFIX_SHARE}/fish/completions" - install -d "$DESTDIR${PREFIX_SHARE}/doc/0install" - install -d "$DESTDIR${PREFIX}/${ZSHFUNCTIONS}" --install -d "$DESTDIR${PREFIX}/lib/0install.net" -+install -d "$DESTDIR${PREFIX}/lib64/0install.net" - - install -m 0644 ${DOCS} "$DESTDIR${PREFIX_SHARE}/doc/0install/" - install -m 0644 ${MANPAGES} "$DESTDIR${PREFIX_MAN}/man1/" -@@ -93,7 +93,7 @@ install -m 0755 share/0install.net/unlzm - install -m 0755 share/0install.net/unxz "$DESTDIR${PREFIX_SHARE}/0install.net/" - - if [ -n "$PLUGINS" ]; then -- install -m 0644 $PLUGINS "$DESTDIR${PREFIX}/lib/0install.net/" -+ install -m 0644 $PLUGINS "$DESTDIR${PREFIX}/lib64/0install.net/" - fi - - for size in 24x24 48x48 128x128 scalable; do \ -diff -up ./ocaml/Makefile.orig ./ocaml/Makefile -diff -up ./ocaml/zeroinstall/gui.ml.orig ./ocaml/zeroinstall/gui.ml ---- ./ocaml/zeroinstall/gui.ml.orig 2015-09-02 14:32:01.260129993 +1000 -+++ ./ocaml/zeroinstall/gui.ml 2015-09-02 14:34:51.351136051 +1000 -@@ -337,7 +337,7 @@ let try_get_gui config ~use_gui = - if system#file_exists plugin_path then Some plugin_path else None in - - let plugin_path = -- let sys_lib = Filename.dirname bindir +/ "lib" in -+ let sys_lib = Filename.dirname bindir +/ "lib64" in - U.first_match check_plugin_dir [ - (* Was 0install installed with opam? *) - sys_lib +/ "0install"; diff --git a/0install.spec b/0install.spec index 8cde279..7a14e06 100644 --- a/0install.spec +++ b/0install.spec @@ -1,161 +1,82 @@ -%global cache_dir /var/cache/0install.net -%global gettext_domain_name zero-install +# PACKAGING NOTE: We do not currently build either the command-line tool or the +# GUI interface. They depend on obus (https://github.com/ocaml-community/obus) +# which cannot be built for the version of OCaml currently in Fedora. For now +# we only build the solver, which is the only part needed by opam anyway. + +%global giturl https://github.com/0install/0install + Name: 0install -Version: 2.12.1 +Version: 2.18 Release: %autorelease -Summary: A decentralized cross-distribution software installation system +Summary: Decentralized cross-distribution software installation system -License: LGPLv2+ -URL: http://0install.net -Source0: http://downloads.sf.net/project/zero-install/%{name}/%{version}/%{name}-%{version}.tar.bz2 -# Temporarily disable tests, some failures within mock env -Patch0: %{name}-2.6-no-tests.patch -# multilib: use lib64 instead of lib on 64-bit arches -Patch1: %{name}-2.9.1-lib64.patch -Patch2: %{name}-2.10-makefile.patch +License: LGPL-2.1-or-later +URL: https://0install.net/ +VCS: git:%{giturl}.git +Source0: %{giturl}/releases/download/v%{version}/%{name}-%{version}.tbz +Source1: %{giturl}/releases/download/v%{version}/%{name}-%{version}.tbz.sig +# Key for Thomas Leonard +Source2: 5DD58D70899C454A966D6A5175133C8F94F6E0CC.gpg -BuildRequires: ocaml >= 4.02.3 -BuildRequires: ocaml-biniou-devel -BuildRequires: ocaml-easy-format-devel -BuildRequires: ocaml-findlib -BuildRequires: ocaml-camlp4-devel -BuildRequires: ocaml-curl-devel >= 0.7.9 -BuildRequires: ocaml-extlib-devel -BuildRequires: ocaml-lablgtk-devel -BuildRequires: ocaml-lwt-devel -# not packaged yet, optional -# BuildRequires: ocaml-obus-devel -BuildRequires: ocaml-ocamlbuild -BuildRequires: ocaml-ounit-devel -BuildRequires: ocaml-ssl-devel -BuildRequires: ocaml-xmlm-devel -BuildRequires: ocaml-yojson-devel -BuildRequires: glib2-devel -BuildRequires: libev-devel -BuildRequires: gettext -BuildRequires: desktop-file-utils +# OCaml packages not built on i686 since OCaml 5 / Fedora 39. +ExcludeArch: %{ix86} -Requires(pre): shadow-utils +BuildRequires: gnupg2 +BuildRequires: ocaml >= 4.08 +BuildRequires: ocaml-dune >= 2.5 +BuildRequires: ocaml-ounit2-devel -# for icons -Requires: hicolor-icon-theme +%global _desc %{expand: +Zero Install is a decentralized cross-distribution software installation +system. Other features include full support for shared libraries (with +a SAT solver for dependency resolution), sharing between users, and +integration with native platform package managers. It supports both +binary and source packages, and works on Linux, macOS, Unix and Windows +systems.} -# ocaml-ext-devel is missing -ExcludeArch: ppc64 ppc64le +%description %_desc -%if 0%{?epel} -# Explict require ocaml-react-devel, otherwise -# ocamlfind: Package `lwt.react' not found -BuildRequires: ocaml-react-devel -%endif +%package -n ocaml-0install-solver +Summary: Package dependency solver +%description -n ocaml-0install-solver %_desc -Provides: zeroinstall-injector = %{version}-%{release} -Obsoletes: zeroinstall-injector < 2.4-1%{?dist} +This package contains a package dependency resolver based on a SAT +solver. This was originally written for the 0install package manager, +but is now generic and is also used as a solver backend for opam. -%description -Zero Install is a decentralized cross-distribution software -installation system available under the LGPL. It allows software -developers to publish programs directly from their own web-sites, -while supporting features familiar from centralized distribution -repositories such as shared libraries, automatic updates and digital -signatures. It is intended to complement, rather than replace, the -operating system's package management. 0install packages never -interfere with those provided by the distribution. +The SAT solver is based on MiniSat (http://minisat.se/Papers.html) and +the application to package management is based on OPIUM (Optimal Package +Install/Uninstall Manager). 0install-solver uses a (novel?) strategy to +find the optimal solution extremely quickly (even for a SAT-based +solver). -0install does not define a new packaging format; unmodified tarballs -or zip archives can be used. Instead, it defines an XML metadata -format to describe these packages and the dependencies between them. A -single metadata file can be used on multiple platforms (e.g. Ubuntu, -Debian, Fedora, openSUSE, Mac OS X and Windows), assuming binary or -source archives are available that work on those systems. - -0install also has some interesting features not often found in -traditional package managers. For example, while it will share -libraries whenever possible, it can always install multiple versions -of a package in parallel when there are conflicting -requirements. Installation is always side-effect-free (each package is -unpacked to its own directory and will not touch shared directories -such as /usr/bin), making it ideal for use with sandboxing -technologies and virtualization. - -The XML file describing the program's requirements can also be -included in a source-code repository, allowing full dependency -handling for unreleased developer versions. For example, a user can -clone a Git repository and build and test the program, automatically -downloading newer versions of libraries where necessary, without -interfering with the versions of those libraries installed by their -distribution, which continue to be used for other software. +%package -n ocaml-0install-solver-devel +Summary: Development files for %{name}-solver +Requires: ocaml-0install-solver%{?_isa} = %{version}-%{release} +%description -n ocaml-0install-solver-devel +The %{name}-solver-devel package contains libraries and signature files +for developing applications that use %{name}-solver. %prep -%setup -q -%patch0 -p1 -b .no-tests -%if "%{_lib}" == "lib64" -%patch1 -p0 -b .lib64 -%endif -%patch2 -p0 -b .translation - -## Remove Utilities from .desktop file, so it will use Settings as main category -sed -i -e 's/Utility;//' share/applications/%{name}.desktop +%{gpgverify} --data=%{SOURCE0} --signature=%{SOURCE1} --keyring=%{SOURCE2} +%autosetup %build -make -make update-mo - +%dune_build -p 0install-solver %install -make install_system DESTDIR=$RPM_BUILD_ROOT +%dune_install 0install-solver -# fix permission of shared objects -chmod +x $RPM_BUILD_ROOT%{_libdir}/0install.net/gui_gtk.cmxs +%check +%dune_check -p 0install-solver -mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations" - -desktop-file-validate \ - $RPM_BUILD_ROOT%{_datadir}/applications/0install.desktop - -## Copy mo files -mkdir -p %{buildroot}%{_datadir}/locale -cp -R build/share/locale/* %{buildroot}%{_datadir}/locale - -%find_lang %{gettext_domain_name} - -## Remove excess doc -rm -fr %{buildroot}/usr/share/doc/%{name} - -%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 %{gettext_domain_name}.lang -%doc COPYING README.md -%{_bindir}/0* -%{_libdir}/0install.net -%{_datadir}/0install.net -%{_datadir}/appdata/0install* -%{_datadir}/applications/0install.desktop -%{_datadir}/icons/hicolor/*/apps/zeroinstall.* -%dir %{_datadir}/bash-completion -%dir %{_datadir}/bash-completion/completions -%{_datadir}/bash-completion/completions/0* -%dir %{_datadir}/fish -%dir %{_datadir}/fish/completions -%{_datadir}/fish/completions/0*.fish -%dir %{_datadir}/zsh -%dir %{_datadir}/zsh/site-functions -%{_datadir}/zsh/site-functions/_0* -%{_mandir}/man1/0* -%dir %{cache_dir} -%attr(755,zeroinst,zeroinst) %{cache_dir}/implementations +%files -n ocaml-0install-solver -f .ofiles +%doc CHANGES.md README.md +%license COPYING +%files -n ocaml-0install-solver-devel -f .ofiles-devel %changelog %autochangelog diff --git a/5DD58D70899C454A966D6A5175133C8F94F6E0CC.gpg b/5DD58D70899C454A966D6A5175133C8F94F6E0CC.gpg new file mode 100644 index 0000000000000000000000000000000000000000..736c830f52f48ae85ffd63256fed43cefecc45ce GIT binary patch literal 4441 zcmaLaWl$81*1&Og>5e6&QvvBlx?!ajk&upEkX*V`kOib`0jY%*L`ew&>28ovS|k<; z>6Uos`n)su&fJ;%`F#D&`Ja;mB*iga6y^a?V7(<#Fd2VZ=Ac#DBW44@^N=S)OuQC; z0Gtdaaaj{%w4-EXdb%*iQ#sc_`Z>vcrLXn;E4$d1L150^iz$)$SL^~xLIWr99VCcv z$h@XBJ*j+`mB7~anqN;uf+`6vPK4r4R=-y_z%YAS(at@xmTBQr7ii%a_@24@;gqKG zQ7NW|D4@g5#yTerOVX;CK<)SuN!>Y*Uv{KI*e4hAhL89>ezyKQ!dgj_uj8-BlidTB zD~}IG%>o(Vi7cGjc~?;bJF8@Tcwb@KIqm_RZTW+WOcJDqb2`Q}Nl76)_)oNx>>AiB z6QrP;I|e+`A^$_n~CY-tI%c58bCtc_bM`C@@ER?wV-7QI} z!IfMOUmjQRDCm}_X)9)8b|uYawe8E469g2&1*C8T<*ql6_iZef`M))MJ&rUF*NF1) zRxz&aOj|lHJZWl+E9o|Ae( zHwCqbh;U`Q&yuwC;)$|Su;Ey^&yI9!rhbLz%>0tewz)rZm{Mly%zyVdBrC%d<50~< zmjB&_EDSLr*rh2&cAjct8Y`iH-M$eaXvP2z)=Y^zzwGR<+3AQhfWhjLQK&DnCc?uY zxJxjh<#^Rab>1xP44 zy4gCp3fjZn6yks~I3NH478j5a8<&`n03REdhKP`W7?&1^4Zs4j0DyE6xIp7Y;bR~@ z0E>u_!WSf$oN>N7npsDF$1CanmVyJR5vei$*jL>XG68Y6Zr@QMdX084z3zP)yRy#4 zFfHumJ%40|P^0Nie)xl1y|+ZmuZLP(&$6|7@O@uZT?Q$dyxuh`Y(~(sCP=ME?vPL_ zkS>Z<#rwubv1!( z>lXEiRY4A=l=eVuOBrKlD$;xFQyaS=rjgePrIs~IHUIcjEMUc5!}VZ+eU{oFpnF~Q zXbA})_y4UxZ1lEq<|lEhe+#e^l7E1i>G(rYz5&}!pOV=Wn-W>ddkrPk`MPp7XRKU5*GwN}=}Bs+jY_z5knb{JYCPq&*;dX`iIW64~x z5+~T@V_tZK8q>Mu0*znZ%K2eJ=#K{oR{{YI6W8R65C$kxp9K+auf12-j)4~AbHT66#} z6gr+E0}^T7w=^QYQk2D+LajZ)?`mbqCF~N=)DlUlPApeB$*UFFi82ihp(Wkk(cP36 zwM@>TX4Z{~zE5YThTXC+PZWL^OV?W}VW-L$&zI841Wx4^rO|TyX(Ni(1?OtJnRoM_ z$6M=pnS9T4E_v{a_JB?nyLjl$Q6o4L>sswoK~3#96Ug!it6=tlAXqm{wPJN=1jpb6 zjnNOI+8btG@ohU~DL-bV7iDCEg`^X|PbtRr*-)a|R`_~7Csf&dJxM9b6qMGs)4JC& zu=|6i#ho^VYshqI>9Lr$TKh^&5_dc2@8KBsmSnP0E#ZFfjH1?u04%mtum-E;mzw`pO@tpnfz{HppH&dd z-D6x4evt?-BzYYxYoeWNG1L}`a3S|gmNdcNkV!yZWZt-aSMWmS;Ba5QGyowX3^lz` zRL0l-LlRr`Ax^EOd`=%iFd~&iAHHxlnsr#rJwS4#{0c}&=WWr0lsJCiqkm4j6$kpL z3pLMfbZk&3vNalv;E=~b!%(jzV;YKHeKs8T^Ot>L3(%o@lG!<`pcJ6GpaozicXnvb z_!&-YiK!eNP{?xSDNub=9>=;@f-ebfXR>IiEtMXFPh?Bo>WDk5ucqZ=`ogE&@}*@p ztsZPA)A%y`z!EijnUYBZLr&d@$v zIal6i+WM=fdLypG$zXBBRs|LdQwNvbCI7Eo(xUk z%B4%UcG%0R7`KeP_ILPEt$jz_i3 z(`B4!$_z#4Kj0j};i|yTT)h4A74_SSo&KWz``#*!HT9X>ozDa1mm;c0@L}^)zEPRm z_yW4hUt#+2ZxddsqTCv}t$4*RiX}tu4$p$dY$xa$c)F@610gE%B31QrOg_C|e(~BN z*$G(YS(24e!9kRWy}ZQb5$IxOaGGNF_hLKb(fGvJmJrGG2=3pi#o;L6JOB`25&mnF zi0}g$fk57Wcd5&g4Tl~;fQ9$Z^k2&akG8mLE z)B0ODx#~y8*}bl5HZfL~-0ZdWAK@+&7mT%! zY7W@aJt>zjy`%Vk-dDTt&w0pCijE$|9`3_i_!@9nnx_wZ={fnc41GNMWWe+UM?;c{ ze>ToONuN9Bb_@{TF=^(O;yWvrKRgVEj7@v=l%ii}Q^|3dXiF(V9Pzs$Bbht)OS~BN z_6+T+{-bhjPIscl+ix^-_&kk;JV=Gw@*_@3o&pUn)R^7pczN!o01MndbH|_4qt-PX zTpwXejFyAS%LMh@7^LZ9v|kT!5v#PC+_v(cu58GxfCq-41u?Fd3ZRP8_fsM7F^lv! zH&H$-%Tt z^-_9Rr3#`SEWS!6O6UfMO)_m2o*D59%Jxi|T-eYka3;(d@4;t2-QB7+_&nP}S3(T9 z@%ld7GPS|jTY?PiQfW&TKO#s?j1GFhy4dzoROi>EbVy=GuizLmDTHvctaifIb2J1iIFrhX#xjg)y5%O1rJ0 z8kL7rc?aj>Fw;rDq+I7dDh+D0mb=AX>Cy>a@H-o2>xNzqGGsh`w4-7ZKtQNL{8H;G zQO)N&x)sNxS4j3mGxstRQ)?tx;cn&W_yIajQBQ<3%^92Xj-3vcDG+NpK6AF?AuLvu zURs{eDE>)|yKyo}1(e?d8cL1s7#`TO8FBf^LWP+%R0ggF9vUvHYidko)Zl532pwai zLxsLCx_p)~aDgwIB;3vsHrTGeO|#A;H9e#CFXTgeI32&r!sKmcli8nQfP98(NF*Qe zuatT`@KyR`0{tPhCjj-@!aPq>Cx_V0eTcK)lU1UA)Wf2V<%@&sO@#C%u&~mJaZ^q$ zHsHh&ce-0Pz1%#3k;nFQ`%bJH>IE;5hXq(!xF^VgLs$wg7z`cW*-xcC|`R(MtVg z?k<;(bgbJ-o@jn=jJ@v&8+jBEMmM{p`)gJ*A<~BVVnKTU0Qv~A{Stwb6WTH+ZicEz zkO?Y#?n{&XzuxfO6RtVi$13<{- zr7n}b_{nRH*Cl4qjpwy!AuP22zyfJqlwn`jC(OT{LAG0m@5Mbd8rv zjK)Lpl(rLX1YAzm2zv0bAVe)v_X$q%o2X_xm9`7}UIQBhPa@0)$Qzp;Z}p0l`j?m) zMCe3Ww@IFW?OHOw(ULhU3TUNtfs6_r^1jtd08<`#yjfE|;-5PDcC_`bwjeb-(mb%b zT6k5Zt{ztjOKAFr)u7>YTtG;in#}E_gCH%rowZ|W){$ebLabv7!imr~q7yHR&jL01 z!4V%tV~MF1+W0gzs%U27B4VQk?*9o2koDg|5#|9hlKkfhx@Av(OOxjh<9gnlY8ot! z$8Xh|RSdg#58LNXK9`v;4^G3>F^hByi(M6Tc(k<0OPOP-V8599~I-s$ua=XbPT@l2Q%Q!XnVw0d_;?43~czAhOgYJKd! z*=2EtQzeqBgF?^qlstkYJ4W#gg#I>7M6?Cj7Q?!sNC;1L(8;LN9?Zp=QH-3EJR7)G za*o$s=mQAs1ZRPr8OZkhBL*_ZCr=;huJFnJ32?fWy}zi+8}D-C9VEkh`t|csU949O z&c0dtioaSlRQ{fhugU=bM_Mg(jVl&%taSH=YkeV zRj!ZAI=rMB?W=AvjDyKFiwaR1_c#Xgv*a!ClKMWgc`q0V#9r2JqJp$d#Rc+8WQ~m?YN# k6d6k# Date: Thu, 9 Jan 2025 20:32:12 -0700 Subject: [PATCH 29/36] OCaml 5.3.0 rebuild for Fedora 42 From 877a8490da4f140e47ff2f833aee07279067fd6d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 08:19:05 +0000 Subject: [PATCH 30/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 3709a02e99634f72cb94d05786a5f10db20f34ec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 20 Jan 2025 07:15:35 +0000 Subject: [PATCH 31/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 37531e4dec4b97489dbc4531e44f1896be0f9d90 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 12 Jul 2025 12:58:01 -0600 Subject: [PATCH 32/36] Rebuild to fix OCaml dependencies From db5ed30e92912cef9def97778f39ef961c07c3f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 15:38:46 +0000 Subject: [PATCH 33/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 704bfe19d95f75481dc4a7e7da0d1cd52d9df73a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 14 Oct 2025 09:43:06 +0100 Subject: [PATCH 34/36] OCaml 5.4.0 rebuild From 7a3940cea22ee9eb3a721a8709a5382d74f7b1e7 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 9 Jan 2026 11:53:07 -0700 Subject: [PATCH 35/36] Reflow the description text - Add a SourceLicense tag --- 0install.spec | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/0install.spec b/0install.spec index 7a14e06..f0f7838 100644 --- a/0install.spec +++ b/0install.spec @@ -10,7 +10,11 @@ Version: 2.18 Release: %autorelease Summary: Decentralized cross-distribution software installation system +# LGPL-2.1-or-later: the project as a whole +# CC0-1.0: share/metainfo/0install.appdata.xml +# LicenseRef-Fedora-Public-Domain: src/sample_client.py License: LGPL-2.1-or-later +SourceLicense: %{license} AND CC0-1.0 AND LicenseRef-Fedora-Public-Domain URL: https://0install.net/ VCS: git:%{giturl}.git Source0: %{giturl}/releases/download/v%{version}/%{name}-%{version}.tbz @@ -26,38 +30,37 @@ BuildRequires: ocaml >= 4.08 BuildRequires: ocaml-dune >= 2.5 BuildRequires: ocaml-ounit2-devel -%global _desc %{expand: -Zero Install is a decentralized cross-distribution software installation -system. Other features include full support for shared libraries (with -a SAT solver for dependency resolution), sharing between users, and -integration with native platform package managers. It supports both -binary and source packages, and works on Linux, macOS, Unix and Windows -systems.} +%global _desc %{expand:Zero Install is a decentralized cross-distribution software installation +system. Other features include full support for shared libraries (with a SAT +solver for dependency resolution), sharing between users, and integration with +native platform package managers. It supports both binary and source +packages, and works on Linux, macOS, Unix and Windows systems.} -%description %_desc +%description +%_desc %package -n ocaml-0install-solver Summary: Package dependency solver -%description -n ocaml-0install-solver %_desc +%description -n ocaml-0install-solver +%_desc -This package contains a package dependency resolver based on a SAT -solver. This was originally written for the 0install package manager, -but is now generic and is also used as a solver backend for opam. +This package contains a package dependency resolver based on a SAT solver. +This was originally written for the 0install package manager, but is now +generic and is also used as a solver backend for opam. -The SAT solver is based on MiniSat (http://minisat.se/Papers.html) and -the application to package management is based on OPIUM (Optimal Package -Install/Uninstall Manager). 0install-solver uses a (novel?) strategy to -find the optimal solution extremely quickly (even for a SAT-based -solver). +The SAT solver is based on MiniSat (http://minisat.se/Papers.html) and the +application to package management is based on OPIUM (Optimal Package +Install/Uninstall Manager). 0install-solver uses a (novel?) strategy to find +the optimal solution extremely quickly (even for a SAT-based solver). %package -n ocaml-0install-solver-devel Summary: Development files for %{name}-solver Requires: ocaml-0install-solver%{?_isa} = %{version}-%{release} %description -n ocaml-0install-solver-devel -The %{name}-solver-devel package contains libraries and signature files -for developing applications that use %{name}-solver. +The %{name}-solver-devel package contains libraries and signature files for +developing applications that use %{name}-solver. %prep %{gpgverify} --data=%{SOURCE0} --signature=%{SOURCE1} --keyring=%{SOURCE2} From bacdf6c7ea2ce6bf0ee0988318a1d29a85c082ec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 02:25:10 +0000 Subject: [PATCH 36/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild