Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-facile for openSUSE:Factory checked in at 2022-04-06 21:51:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-facile (Old) and /work/SRC/openSUSE:Factory/.ocaml-facile.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-facile" Wed Apr 6 21:51:12 2022 rev:23 rq:967048 version:1.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-facile/ocaml-facile.changes 2020-03-09 14:13:50.214524507 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml-facile.new.1900/ocaml-facile.changes 2022-04-06 21:51:29.495567042 +0200 @@ -1,0 +2,6 @@ +Mon Apr 4 04:04:04 UTC 2022 - oher...@suse.de + +- Add ocaml-facile.patch for dune 3 +- Remove obsolete ocaml-4.patch + +------------------------------------------------------------------- Old: ---- ocaml-4.patch New: ---- ocaml-facile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-facile.spec ++++++ --- /var/tmp/diff_new_pack.MPTLHD/_old 2022-04-06 21:51:29.995561336 +0200 +++ /var/tmp/diff_new_pack.MPTLHD/_new 2022-04-06 21:51:30.003561245 +0200 @@ -1,7 +1,7 @@ # # spec file for package ocaml-facile # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,12 +24,12 @@ License: LGPL-2.1+ Group: Development/Languages/OCaml Url: https://github.com/Emmanuel-PLF/facile -Source0: %{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE ocaml-4.patch hrvoje.sen...@gmail.com -- Fixes build with ocaml 4 -Patch0: ocaml-4.patch +Source0: %name-%version.tar.xz +Patch0: %name.patch BuildRequires: ocaml BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20200220 +BuildRequires: ocaml-rpm-macros >= 20220222 +BuildRequires: ocamlfind(stdlib-shims) %description FaCiLe is a constraint programming library on integer and integer set @@ -50,19 +50,20 @@ efficient language. %package devel -Summary: Development files for %{name} +Summary: Development files for %name Group: Development/Languages/OCaml -Requires: %{name} = %{version} +Requires: %name = %version +Requires: ocamlfind(stdlib-shims) %description devel -The %{name}-devel package contains libraries and signature files for -developing applications that use %{name}. +The %name-devel package contains libraries and signature files for +developing applications that use %name. %prep %autosetup -p1 %build -test -f lib/jbuild && dune upgrade --verbose +rm -fv */jbuild dune_release_pkgs='facile' %ocaml_dune_setup %ocaml_dune_build @@ -74,8 +75,8 @@ %check %ocaml_dune_test -%files -f %{name}.files +%files -f %name.files -%files devel -f %{name}.files.devel +%files devel -f %name.files.devel %changelog ++++++ ocaml-facile-1.1.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-facile-1.1.4/.gitignore new/ocaml-facile-1.1.4/.gitignore --- old/ocaml-facile-1.1.4/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-facile-1.1.4/.gitignore 2017-11-30 20:24:10.000000000 +0100 @@ -0,0 +1,4 @@ +_build/ +.merlin +*.install +*.depend ++++++ ocaml-facile.patch ++++++ --- /dev/null +++ b/dune-project @@ -0,0 +1,2 @@ +(lang dune 1.11) +(name facile) --- /dev/null +++ b/lib/dune @@ -0,0 +1,5 @@ +(library + (public_name facile) + (libraries stdlib-shims) + (ocamlopt_flags (-unsafe -noassert -inline 10)) +) --- 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 Stdlib.not solved.(i) then begin Fcl_stak.set nb_solved (Fcl_stak.get nb_solved + 1); array_set_true solved i end in --- a/lib/fcl_fdArray.ml +++ b/lib/fcl_fdArray.ml @@ -299,7 +299,7 @@ let get array index = let (mi, ma) = Array.fold_left (fun (mi, ma) e -> - (Pervasives.min mi (Fd.min e), Pervasives.max ma (Fd.max e))) + (Stdlib.min mi (Fd.min e), Stdlib.max ma (Fd.max e))) (max_int, min_int) array in if mi = ma then Fd.int mi else let value = Fd.create (Fcl_domain.interval mi ma) in --- a/lib/fcl_misc.ml +++ b/lib/fcl_misc.ml @@ -50,9 +50,9 @@ module Operators = struct x - y *) - let (+) = Pervasives.(+) - let (-) = Pervasives.(-) - let ( * ) = Pervasives.( * ) + let (+) = Stdlib.(+) + let (-) = Stdlib.(-) + let ( * ) = Stdlib.( * ) 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 (Stdlib.abs min_y) (Stdlib.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 -> Stdlib.min (Fd.min x) inf, Stdlib.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 -> Stdlib.min (Fd.min x) inf, Stdlib.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;;
