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