Hello community, here is the log from the commit of package ocaml-extlib for openSUSE:Factory checked in at 2019-02-24 17:09:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-extlib (Old) and /work/SRC/openSUSE:Factory/.ocaml-extlib.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-extlib" Sun Feb 24 17:09:36 2019 rev:5 rq:620955 version:1.7.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-extlib/ocaml-extlib.changes 2017-08-18 15:01:44.128695735 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-extlib.new.28833/ocaml-extlib.changes 2019-02-24 17:09:41.908518698 +0100 @@ -1,0 +2,14 @@ +Tue Apr 24 07:01:39 UTC 2018 - [email protected] + +- Update to upstream release 1.7.4 + * String: faster slice + * various fixes for i31 + * base64: add encode_string decode_string + * OCaml 4.06 compatibility +- Add fix32bit.patch from upstream to fix building on 32-bit arch +- Use upstream Makefile to build +- Fix BuildRequires: cppo_ocamlbuild +- Fix License: to include exception +- Use GitHub archive as Source0: + +------------------------------------------------------------------- Old: ---- extlib-1.7.2.tar.gz New: ---- fix32bit.patch ocaml-extlib-1.7.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-extlib.spec ++++++ --- /var/tmp/diff_new_pack.J598I3/_old 2019-02-24 17:09:42.784518423 +0100 +++ /var/tmp/diff_new_pack.J598I3/_new 2019-02-24 17:09:42.788518422 +0100 @@ -1,7 +1,7 @@ # # spec file for package ocaml-extlib # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2011 Andrew Psaltis <ampsaltis at gmail dot com> # # All modifications and additions to the file contributed by third parties @@ -18,19 +18,20 @@ Name: ocaml-extlib -Version: 1.7.2 +Version: 1.7.4 Release: 0 %{?ocaml_preserve_bytecode} Summary: OCaml ExtLib additions to the standard library -License: LGPL-2.1+ +License: LGPL-2.1-or-later WITH OCaml-linking-exception Group: Development/Languages/OCaml Url: https://github.com/ygrek/ocaml-extlib -Source0: extlib-%{version}.tar.gz +Source0: https://github.com/ygrek/ocaml-extlib/archive/%{version}/%{name}-%{version}.tar.gz +# https://github.com/ygrek/ocaml-extlib/commit/21784d25591db39fe74ea2626bd703ba8b2b2181 +Patch0: fix32bit.patch BuildRequires: ocaml -BuildRequires: ocaml-oasis BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-rpm-macros >= 4.03 -BuildRequires: ocamlfind(ocamlbuild_cppo) +BuildRequires: ocamlfind(cppo_ocamlbuild) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -51,85 +52,22 @@ developing applications that use %{name}. %prep -%setup -q -n extlib-%{version} +%setup -q -n %{name}-%{version} +%patch0 -p1 %build -rm -fv setup.ml myocamlbuild.ml META* _* */_* */META* -# -tee cppo <<_EOF_ -#!/bin/bash -exec $(type -p cppo) `ocaml src/configure.ml | xargs` "\$@" -_EOF_ -chmod -v 00755 cppo -export PATH=$PWD:$PATH -# -tee src/_tags <<_EOF_ -<**/*.ml>: pp(cppo) -<**/*.mli>: pp(cppo) -_EOF_ -# obs service changes every ^Version line ... -sh -c "sed 's/^Version.*/Version: %{version}/' | tee _oasis" <<_EOF_ -OASISFormat: 0.4 -Name: %{name} -Version: %{version} -Synopsis: Extended Standard Library for OCaml -Authors: [email protected] -License: %{license} -Plugins: META(`oasis version`) -BuildTools: ocamlbuild, cppo -OCamlVersion: >= 4.03 -AlphaFeatures: ocamlbuild_more_args -XOCamlbuildPluginTags: package(ocamlbuild_cppo) - -Library extlib - Install: true - Path: src - Modules: \ - Base64, \ - BitSet, \ - Dllist, \ - DynArray, \ - Enum, \ - ExtArray, \ - ExtBuffer, \ - ExtBytes, \ - ExtHashtbl, \ - ExtLib, \ - ExtList, \ - ExtString, \ - Global, \ - IO, \ - OptParse, \ - Option, \ - PMap, \ - RefList, \ - Std, \ - UChar, \ - UTF8, \ - Unzip - -Document "extlib" - Title: API reference for extlib - Type: ocamlbuild - BuildTools+: ocamldoc - InstallDir: \$htmldir - Install: true - XOCamlbuildPath: . - XOCamlbuildLibraries: extlib - -_EOF_ - -%oasis_setup -%ocaml_oasis_configure --enable-docs --enable-tests -%ocaml_oasis_build -%ocaml_oasis_doc +make build doc -j1 %install -%ocaml_oasis_findlib_install +export DESTDIR=$RPM_BUILD_ROOT +export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml +mkdir -p $OCAMLFIND_DESTDIR +make install -j1 %files %defattr(-,root,root,-) -%doc CHANGES LICENSE README.md +%doc CHANGES README.md +%license LICENSE %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/* %if 0%{?ocaml_native_compiler} @@ -138,7 +76,8 @@ %files devel %defattr(-,root,root,-) -%{oasis_docdir_html} +%doc CHANGES README.md src/doc/* +%license LICENSE %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/* %if 0%{?ocaml_native_compiler} @@ -146,13 +85,11 @@ %{_libdir}/ocaml/*/*.cmx %{_libdir}/ocaml/*/*.cmxa %endif -%{_libdir}/ocaml/*/*.annot %{_libdir}/ocaml/*/*.cma %{_libdir}/ocaml/*/*.cmi %{_libdir}/ocaml/*/*.cmt %{_libdir}/ocaml/*/*.cmti %{_libdir}/ocaml/*/*.mli -%{_libdir}/ocaml/*/*.ml %{_libdir}/ocaml/*/META %changelog ++++++ fix32bit.patch ++++++ >From 21784d25591db39fe74ea2626bd703ba8b2b2181 Mon Sep 17 00:00:00 2001 From: ygrek <[email protected]> Date: Sun, 15 Apr 2018 18:48:33 +0300 Subject: [PATCH] IO: restore compilation on 32-bit (broken in 1.7.3) close #46 --- CHANGES | 3 +++ src/IO.ml | 4 ++++ src/configure.ml | 1 + 3 files changed, 8 insertions(+) diff --git a/CHANGES b/CHANGES index 98c143a..5686ee4 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +1.7.5 ? + * IO: restore compilation on 32-bit (broken in 1.7.3) + 1.7.4 (2018-03-12) * fix tests with OCaml 4.06 diff --git a/src/IO.ml b/src/IO.ml index 5dc6262..c4c00bf 100644 --- a/src/IO.ml +++ b/src/IO.ml @@ -574,7 +574,9 @@ let write_i31 ch n = write_32 ch n let write_i32 ch n = +#ifndef WORD_SIZE_32 if n < -0x8000_0000 || n > 0x7FFF_FFFF then raise (Overflow "write_i32"); +#endif write_32 ch n let write_real_i32 ch n = @@ -678,7 +680,9 @@ let write_i31 ch n = write_32 ch n let write_i32 ch n = +#ifndef WORD_SIZE_32 if n < -0x8000_0000 || n > 0x7FFF_FFFF then raise (Overflow "write_i32"); +#endif write_32 ch n let write_real_i32 ch n = diff --git a/src/configure.ml b/src/configure.ml index e04ded7..1f92c89 100644 --- a/src/configure.ml +++ b/src/configure.ml @@ -10,6 +10,7 @@ let () = print_endline (if Sys.ocaml_version >= "4.04.0" then "-D OCAML4_04 " else ""); print_endline (if Sys.ocaml_version >= "4.05.0" then "-D OCAML4_05 " else ""); print_endline (if Sys.ocaml_version >= "4.06.0" then "-D OCAML4_06 " else ""); + print_endline (if Sys.word_size = 32 then "-D WORD_SIZE_32 " else ""); show_bytes "-D WITH_BYTES"; exit 0 | [|_;"-compile-args"|] ->
