Hello community, here is the log from the commit of package ocaml-facile for openSUSE:Factory checked in at 2020-03-09 14:13:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-facile (Old) and /work/SRC/openSUSE:Factory/.ocaml-facile.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-facile" Mon Mar 9 14:13:47 2020 rev:22 rq:778545 version:1.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-facile/ocaml-facile.changes 2019-11-13 13:24:49.667478994 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml-facile.new.26092/ocaml-facile.changes 2020-03-09 14:13:50.214524507 +0100 @@ -1,0 +2,8 @@ +Thu Feb 20 20:20:20 UTC 2020 - [email protected] + +- Update to 1.1.4 + build with dune +- Refresh ocaml-4.patch +- Require current ocaml-rpm-macros + +------------------------------------------------------------------- Old: ---- facile-1.1.tar.gz New: ---- _service ocaml-facile-1.1.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-facile.spec ++++++ --- /var/tmp/diff_new_pack.yA3SMf/_old 2020-03-09 14:13:50.570524742 +0100 +++ /var/tmp/diff_new_pack.yA3SMf/_new 2020-03-09 14:13:50.570524742 +0100 @@ -17,21 +17,19 @@ Name: ocaml-facile -Version: 1.1 +Version: 1.1.4 Release: 0 %{?ocaml_preserve_bytecode} Summary: Ocaml Constraint Programming Library License: LGPL-2.1+ Group: Development/Languages/OCaml Url: https://github.com/Emmanuel-PLF/facile -Source0: http://www.recherche.enac.fr/log/facile/distrib/facile-%{version}.tar.gz +Source0: %{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE ocaml-4.patch [email protected] -- Fixes build with ocaml 4 Patch0: ocaml-4.patch BuildRequires: ocaml -BuildRequires: ocaml-oasis -BuildRequires: ocaml-ocamldoc -BuildRequires: ocaml-rpm-macros >= 4.03 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: ocaml-dune +BuildRequires: ocaml-rpm-macros >= 20200220 %description FaCiLe is a constraint programming library on integer and integer set @@ -61,151 +59,23 @@ developing applications that use %{name}. %prep -%setup -q -n facile-%{version} -%patch0 -p1 +%autosetup -p1 %build -# obs service changes every ^Version line ... -sh -c "sed 's/^Version.*/Version: %{version}/' | tee _oasis" <<_EOF_ -OASISFormat: 0.4 -Name: %{name} -Version: %{version} -Synopsis: Constraint Programming Library -Authors: [email protected] -License: %{license} -Plugins: META(`oasis version`) -BuildTools: ocamlbuild - -Library facile - Install: true - Path: src - Modules: Facile, \ - Fcl_alldiff, \ - Fcl_arith, \ - Fcl_boolean, \ - Fcl_conjunto, \ - Fcl_cstr, \ - Fcl_data, \ - Fcl_debug, \ - Fcl_domain, \ - Fcl_expr, \ - Fcl_fdArray, \ - Fcl_float, \ - Fcl_gcc, \ - Fcl_genesis, \ - Fcl_goals, \ - Fcl_interval, \ - Fcl_invariant, \ - Fcl_linear, \ - Fcl_misc, \ - Fcl_nonlinear, \ - Fcl_opti, \ - Fcl_reify, \ - Fcl_setDomain, \ - Fcl_sorting, \ - Fcl_stak, \ - Fcl_var - CompiledObject: best - -Document "facile" - Title: API reference for facile - Type: ocamlbuild - BuildTools+: ocamldoc - InstallDir: \$htmldir - Install: true - XOCamlbuildPath: . - XOCamlbuildLibraries: facile - -Executable "%{name}-coins" - Path: examples - Install: true - MainIs: coins.ml - BuildDepends: facile -Executable "%{name}-golf" - Path: examples - Install: true - MainIs: golf.ml - BuildDepends: facile -Executable "%{name}-golomb" - Path: examples - Install: true - MainIs: golomb.ml - BuildDepends: facile -Executable "%{name}-jobshop" - Path: examples - Install: true - MainIs: jobshop.ml - BuildDepends: facile -Executable "%{name}-magic" - Path: examples - Install: true - MainIs: magic.ml - BuildDepends: facile -Executable "%{name}-marriage" - Path: examples - Install: true - MainIs: marriage.ml - BuildDepends: facile -Executable "%{name}-prolog" - Path: examples - Install: true - MainIs: prolog.ml - BuildDepends: facile -Executable "%{name}-queens" - Path: examples - Install: true - MainIs: queens.ml - BuildDepends: facile -Executable "%{name}-scheduling" - Path: examples - Install: true - MainIs: scheduling.ml - BuildDepends: facile -Executable "%{name}-seven_eleven" - Path: examples - Install: true - MainIs: seven_eleven.ml - BuildDepends: facile -Executable "%{name}-tiles" - Path: examples - Install: true - MainIs: tiles.ml - BuildDepends: facile -_EOF_ - -%oasis_setup -%ocaml_oasis_configure --enable-docs --enable-tests -%ocaml_oasis_build -%ocaml_oasis_doc +test -f lib/jbuild && dune upgrade --verbose +dune_release_pkgs='facile' +%ocaml_dune_setup +%ocaml_dune_build %install -%ocaml_oasis_findlib_install +%ocaml_dune_install +%ocaml_create_file_list -%files -%defattr(-,root,root) -%{_bindir}/* -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/* -%if 0%{?ocaml_native_compiler} -%{_libdir}/ocaml/*/*.cmxs -%endif - -%files devel -%defattr(-,root,root,-) -%{oasis_docdir_html} -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/* -%if 0%{?ocaml_native_compiler} -%{_libdir}/ocaml/*/*.a -%{_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/*/META +%check +%ocaml_dune_test + +%files -f %{name}.files + +%files devel -f %{name}.files.devel %changelog ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="filename">ocaml-facile</param> <param name="revision">master</param> <param name="scm">git</param> <param name="submodules">disable</param> <param name="url">https://github.com/Emmanuel-PLF/facile.git</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">[v]?([^+]+)(.*)</param> <param name="versionrewrite-replacement">\1</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services> ++++++ ocaml-4.patch ++++++ --- /var/tmp/diff_new_pack.yA3SMf/_old 2020-03-09 14:13:50.602524762 +0100 +++ /var/tmp/diff_new_pack.yA3SMf/_new 2020-03-09 14:13:50.602524762 +0100 @@ -1,24 +1,57 @@ -diff -ur facile-1.1.old/src/facile.mli facile-1.1/src/facile.mli ---- facile-1.1.old/src/facile.mli 2004-09-08 10:51:02.000000000 +0100 -+++ facile-1.1/src/facile.mli 2012-06-10 21:06:41.553916954 +0100 -@@ -127,7 +127,7 @@ - module Hashtbl : - sig - type ('a, 'b) t -- val create : int -> ('a, 'b) t -+ val create : ?random:bool -> int -> ('a, 'b) t - val get : ('a, 'b) t -> ('a, 'b) Hashtbl.t - val add : ('a, 'b) t -> 'a -> 'b -> unit - val find : ('a, 'b) t -> 'a -> 'b -diff -ur facile-1.1.old/src/fcl_data.mli facile-1.1/src/fcl_data.mli ---- facile-1.1.old/src/fcl_data.mli 2004-09-08 10:51:02.000000000 +0100 -+++ facile-1.1/src/fcl_data.mli 2012-06-10 21:06:25.841590828 +0100 -@@ -23,7 +23,7 @@ +--- a/lib/fcl_cstr.ml ++++ b/lib/fcl_cstr.ml +@@ -50,7 +50,7 @@ let create ?(name = "anonymous") ?(nb_wa + and nb_solved = Fcl_stak.ref 0 in + let update i = + if update i then +- if Pervasives.not solved.(i) then begin ++ if solved.(i) == false then begin + Fcl_stak.set nb_solved (Fcl_stak.get nb_solved + 1); + array_set_true solved i + end in +--- a/lib/fcl_misc.ml ++++ b/lib/fcl_misc.ml +@@ -50,9 +50,9 @@ module Operators = struct + x - y + *) - module Hashtbl : sig - type ('a, 'b) t -- val create : int -> ('a, 'b) t -+ val create : ?random:bool -> int -> ('a, 'b) t - val get : ('a, 'b) t -> ('a, 'b) Hashtbl.t - val add : ('a, 'b) t -> 'a -> 'b -> unit - val find : ('a, 'b) t -> 'a -> 'b +- let (+) = Pervasives.(+) +- let (-) = Pervasives.(-) +- let ( * ) = Pervasives.( * ) ++ let (+) = (+) ++ let (-) = (-) ++ let ( * ) = ( * ) + + let (=+) x y = x := !x + y + let (=+.) x y = x := !x +. y +--- a/lib/fcl_nonlinear.ml ++++ b/lib/fcl_nonlinear.ml +@@ -274,7 +274,7 @@ let min_max_of_div_for_div a b z = + let min_max_of_remainder x y = + let r_abs_max = + let min_y, max_y = Fd.min_max y in +- max (Pervasives.abs min_y) (Pervasives.abs max_y) - 1 in ++ max (abs min_y) (abs max_y) - 1 in + if Fd.min x >= 0 then (0, r_abs_max) + else if Fd.max x <= 0 then ((0 - r_abs_max), 0) + else ((0 - r_abs_max), r_abs_max) +--- a/lib/fcl_sorting.ml ++++ b/lib/fcl_sorting.ml +@@ -355,7 +355,7 @@ let sortp a = + else + let inf, sup = + Array.fold_left +- (fun (inf, sup) x -> Pervasives.min (Fd.min x) inf, Pervasives.max (Fd.max x) sup) (max_int, min_int) a in ++ (fun (inf, sup) x -> min (Fd.min x) inf, max (Fd.max x) sup) (max_int, min_int) a in + let d = Fd.array n inf sup + and p = Fd.array n 0 (n - 1) in + Fcl_cstr.post (cstr a ~p:(Some p) d); +@@ -368,7 +368,7 @@ let sort a = + else + let inf, sup = + Array.fold_left +- (fun (inf, sup) x -> Pervasives.min (Fd.min x) inf, Pervasives.max (Fd.max x) sup) (max_int, min_int) a in ++ (fun (inf, sup) x -> min (Fd.min x) inf, max (Fd.max x) sup) (max_int, min_int) a in + let d = Fd.array n inf sup in + Fcl_cstr.post (cstr a d); + d;;
