Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocaml-easy-format for
openSUSE:Factory checked in at 2022-05-05 23:07:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-easy-format (Old)
and /work/SRC/openSUSE:Factory/.ocaml-easy-format.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-easy-format"
Thu May 5 23:07:19 2022 rev:6 rq:975185 version:1.3.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml-easy-format/ocaml-easy-format.changes
2019-11-12 16:11:45.567774285 +0100
+++
/work/SRC/openSUSE:Factory/.ocaml-easy-format.new.1538/ocaml-easy-format.changes
2022-05-05 23:08:00.169677844 +0200
@@ -1,0 +2,7 @@
+Wed Apr 27 12:34:56 UTC 2022 - [email protected]
+
+- Update to version 1.3.3
+ * Fix compile with 5.00
+- remove obsolete ocaml-easy-format.patch
+
+-------------------------------------------------------------------
Old:
----
ocaml-easy-format-1.3.2.tar.xz
ocaml-easy-format.patch
New:
----
ocaml-easy-format-1.3.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml-easy-format.spec ++++++
--- /var/tmp/diff_new_pack.7hvWro/_old 2022-05-05 23:08:00.565678337 +0200
+++ /var/tmp/diff_new_pack.7hvWro/_new 2022-05-05 23:08:00.573678347 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-easy-format
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2015 LISA GmbH, Bingen, Germany.
#
# All modifications and additions to the file contributed by third parties
@@ -18,18 +18,17 @@
Name: ocaml-easy-format
-Version: 1.3.2
+Version: 1.3.3
Release: 0
%{?ocaml_preserve_bytecode}
Summary: Data pretty printing made easy
License: BSD-3-Clause
Group: Development/Languages/OCaml
-Url: https://github.com/ocaml-community/easy-format
-Source0: %{name}-%{version}.tar.xz
-Patch0: %{name}.patch
+URL: https://opam.ocaml.org/packages/easy-format
+Source0: %name-%version.tar.xz
BuildRequires: ocaml
-BuildRequires: ocaml-dune
-BuildRequires: ocaml-rpm-macros >= 20191101
+BuildRequires: ocaml-dune >= 2.9
+BuildRequires: ocaml-rpm-macros >= 20220409
%description
This module offers a high-level and functional interface to the Format module
@@ -48,14 +47,14 @@
are labelled with something like "int main", "let x =" or "x:".
%package devel
-Summary: Development files for %{name}
+Summary: Development files for %name
Group: Development/Languages/OCaml
-Requires: %{name} = %{version}
+Requires: %name = %version
Provides: ocamlfind(easy-format)
%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
@@ -72,8 +71,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
++++++ _service ++++++
--- /var/tmp/diff_new_pack.7hvWro/_old 2022-05-05 23:08:00.597678377 +0200
+++ /var/tmp/diff_new_pack.7hvWro/_new 2022-05-05 23:08:00.601678383 +0200
@@ -1,10 +1,13 @@
<services>
<service name="tar_scm" mode="disabled">
- <param
name="url">https://github.com/ocaml-community/easy-format.git</param>
- <param name="scm">git</param>
- <param name="versionformat">1.3.2</param>
- <param name="revision">1.3.2</param>
<param name="filename">ocaml-easy-format</param>
+ <param name="revision">56c57e69ef067d1cc4e31029d31e77e55b46be95</param>
+ <param name="scm">git</param>
+ <param name="submodules">disable</param>
+ <param
name="url">https://github.com/ocaml-community/easy-format.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>
++++++ ocaml-easy-format-1.3.2.tar.xz -> ocaml-easy-format-1.3.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-easy-format-1.3.2/.gitignore
new/ocaml-easy-format-1.3.3/.gitignore
--- old/ocaml-easy-format-1.3.2/.gitignore 1970-01-01 01:00:00.000000000
+0100
+++ new/ocaml-easy-format-1.3.3/.gitignore 2022-04-27 23:45:40.000000000
+0200
@@ -0,0 +1,4 @@
+*~
+_build
+.merlin
+*.install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-easy-format-1.3.2/CHANGES.md
new/ocaml-easy-format-1.3.3/CHANGES.md
--- old/ocaml-easy-format-1.3.2/CHANGES.md 2019-08-02 07:28:25.000000000
+0200
+++ new/ocaml-easy-format-1.3.3/CHANGES.md 2022-04-27 23:45:40.000000000
+0200
@@ -1,3 +1,8 @@
+1.3.3 (2022-04-27)
+------------------
+
+- OCaml 5.0 compatibility (#27)
+
1.3.2 (2019-08-02)
------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-easy-format-1.3.2/CODEOWNERS
new/ocaml-easy-format-1.3.3/CODEOWNERS
--- old/ocaml-easy-format-1.3.2/CODEOWNERS 1970-01-01 01:00:00.000000000
+0100
+++ new/ocaml-easy-format-1.3.3/CODEOWNERS 2022-04-27 23:45:40.000000000
+0200
@@ -0,0 +1,3 @@
+# If you'd like to become the official maintainer for this project, please
+# let us know.
+* @rgrinberg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-easy-format-1.3.2/dune-project
new/ocaml-easy-format-1.3.3/dune-project
--- old/ocaml-easy-format-1.3.2/dune-project 2019-08-02 07:28:25.000000000
+0200
+++ new/ocaml-easy-format-1.3.3/dune-project 2022-04-27 23:45:40.000000000
+0200
@@ -1,4 +1,4 @@
-(lang dune 1.10)
+(lang dune 2.9)
(name easy-format)
(source (github mjambon/easy-format))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-easy-format-1.3.2/easy-format.opam
new/ocaml-easy-format-1.3.3/easy-format.opam
--- old/ocaml-easy-format-1.3.2/easy-format.opam 2019-08-02
07:28:25.000000000 +0200
+++ new/ocaml-easy-format-1.3.3/easy-format.opam 2022-04-27
23:45:40.000000000 +0200
@@ -1,18 +1,5 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
-build: [
- ["dune" "subst"] {pinned}
- ["dune" "build" "-p" name "-j" jobs]
- ["dune" "runtest" "-p" name "-j" jobs] {with-test}
- ["dune" "build" "-p" name "@doc"] {with-doc}
-]
-maintainer: ["[email protected]" "[email protected]"]
-authors: ["Martin Jambon"]
-bug-reports: "https://github.com/mjambon/easy-format/issues";
-homepage: "https://github.com/mjambon/easy-format";
-doc: "https://mjambon.github.io/easy-format/";
-license: "BSD-3-Clause"
-dev-repo: "git+https://github.com/mjambon/easy-format.git";
synopsis:
"High-level and functional interface to the Format module of the OCaml
standard library"
description: """
@@ -33,7 +20,31 @@
Atoms represent any text that is guaranteed to be printed as-is. Lists can
model
any sequence of items such as arrays of data or lists of definitions that are
labelled with something like "int main", "let x =" or "x:"."""
+maintainer: ["[email protected]" "[email protected]"]
+authors: ["Martin Jambon"]
+license: "BSD-3-Clause"
+homepage: "https://github.com/mjambon/easy-format";
+doc: "https://mjambon.github.io/easy-format/";
+bug-reports: "https://github.com/mjambon/easy-format/issues";
depends: [
- "dune" {>= "1.10"}
+ "dune" {>= "2.9" & >= "1.10"}
"ocaml" {>= "4.02.3"}
+ "odoc" {with-doc}
+]
+build: [
+ ["dune" "subst"] {dev}
+ [
+ "dune"
+ "build"
+ "-p"
+ name
+ "-j"
+ jobs
+ "--promote-install-files=false"
+ "@install"
+ "@runtest" {with-test}
+ "@doc" {with-doc}
+ ]
+ ["dune" "install" "-p" name "--create-install-files" name]
]
+dev-repo: "git+https://github.com/mjambon/easy-format.git";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-easy-format-1.3.2/src/easy_format.ml
new/ocaml-easy-format-1.3.3/src/easy_format.ml
--- old/ocaml-easy-format-1.3.2/src/easy_format.ml 2019-08-02
07:28:25.000000000 +0200
+++ new/ocaml-easy-format-1.3.3/src/easy_format.ml 2022-04-27
23:45:40.000000000 +0200
@@ -1,5 +1,3 @@
-open Format
-
let rev_split l =
let rec inner xs ys = function
| (x, y) :: xys ->
@@ -90,7 +88,7 @@
Atom of string * atom_param
| List of (string * string * string * list_param) * t list
| Label of (t * label_param) * t
- | Custom of (formatter -> unit)
+ | Custom of (Format.formatter -> unit)
type escape =
[ `None
@@ -199,19 +197,19 @@
documentation of the Format module.
*)
let set_escape fmt escape =
- let print0, flush0 = pp_get_formatter_output_functions fmt () in
- let tagf0 = pp_get_formatter_tag_functions fmt () in
+ let print0, flush0 = Format.pp_get_formatter_output_functions fmt () in
+ let tagf0 = Format.pp_get_formatter_stag_functions fmt () in
let is_tag = ref false in
let mot tag =
is_tag := true;
- tagf0.mark_open_tag tag
+ tagf0.mark_open_stag tag
in
let mct tag =
is_tag := true;
- tagf0.mark_close_tag tag
+ tagf0.mark_close_stag tag
in
let print s p n =
@@ -224,12 +222,12 @@
let tagf = {
tagf0 with
- mark_open_tag = mot;
- mark_close_tag = mct
+ mark_open_stag = mot;
+ mark_close_stag = mct
}
in
- pp_set_formatter_output_functions fmt print flush0;
- pp_set_formatter_tag_functions fmt tagf
+ Format.pp_set_formatter_output_functions fmt print flush0;
+ Format.pp_set_formatter_stag_functions fmt tagf
let set_escape_string fmt esc =
@@ -243,7 +241,7 @@
let define_styles fmt escape l =
if l <> [] then (
- pp_set_tags fmt true;
+ Format.pp_set_tags fmt true;
let tbl1 = Hashtbl.create (2 * List.length l) in
let tbl2 = Hashtbl.create (2 * List.length l) in
List.iter (
@@ -251,22 +249,27 @@
Hashtbl.add tbl1 style_name style.tag_open;
Hashtbl.add tbl2 style_name style.tag_close
) l;
- let mark_open_tag style_name =
- try Hashtbl.find tbl1 style_name
- with Not_found -> ""
+ let mark_open_tag = function
+ | Format.String_tag style_name ->
+ (try Hashtbl.find tbl1 style_name
+ with Not_found -> "")
+ | _ -> ""
in
- let mark_close_tag style_name =
- try Hashtbl.find tbl2 style_name
- with Not_found -> ""
+ let mark_close_tag = function
+ | Format.String_tag style_name ->
+ (try Hashtbl.find tbl2 style_name
+ with Not_found -> "")
+ | _ ->
+ ""
in
let tagf = {
- (pp_get_formatter_tag_functions fmt ()) with
- mark_open_tag = mark_open_tag;
- mark_close_tag = mark_close_tag
+ (Format.pp_get_formatter_stag_functions fmt ()) with
+ mark_open_stag = mark_open_tag;
+ mark_close_stag = mark_close_tag
}
in
- pp_set_formatter_tag_functions fmt tagf
+ Format.pp_set_formatter_stag_functions fmt tagf
);
(match escape with
@@ -279,10 +282,10 @@
match p.wrap_body with
`Always_wrap
| `Never_wrap
- | `Wrap_atoms -> pp_open_hvbox fmt indent
+ | `Wrap_atoms -> Format.pp_open_hvbox fmt indent
| `Force_breaks
- | `Force_breaks_rec -> pp_open_vbox fmt indent
- | `No_breaks -> pp_open_hbox fmt ()
+ | `Force_breaks_rec -> Format.pp_open_vbox fmt indent
+ | `No_breaks -> Format.pp_open_hbox fmt ()
let extra_box p l =
let wrap =
@@ -296,8 +299,8 @@
List.for_all (function Atom _ -> true | _ -> false) l
in
if wrap then
- ((fun fmt -> pp_open_hovbox fmt 0),
- (fun fmt -> pp_close_box fmt ()))
+ ((fun fmt -> Format.pp_open_hovbox fmt 0),
+ (fun fmt -> Format.pp_close_box fmt ()))
else
((fun _ -> ()),
(fun _ -> ()))
@@ -305,33 +308,33 @@
let pp_open_nonaligned_box fmt p indent l =
match p.wrap_body with
- `Always_wrap -> pp_open_hovbox fmt indent
- | `Never_wrap -> pp_open_hvbox fmt indent
+ `Always_wrap -> Format.pp_open_hovbox fmt indent
+ | `Never_wrap -> Format.pp_open_hvbox fmt indent
| `Wrap_atoms ->
if List.for_all (function Atom _ -> true | _ -> false) l then
- pp_open_hovbox fmt indent
+ Format.pp_open_hovbox fmt indent
else
- pp_open_hvbox fmt indent
+ Format.pp_open_hvbox fmt indent
| `Force_breaks
- | `Force_breaks_rec -> pp_open_vbox fmt indent
- | `No_breaks -> pp_open_hbox fmt ()
+ | `Force_breaks_rec -> Format.pp_open_vbox fmt indent
+ | `No_breaks -> Format.pp_open_hbox fmt ()
let open_tag fmt = function
None -> ()
- | Some s -> pp_open_tag fmt s
+ | Some s -> Format.pp_open_stag fmt (Format.String_tag s)
let close_tag fmt = function
None -> ()
- | Some _ -> pp_close_tag fmt ()
+ | Some _ -> Format.pp_close_stag fmt ()
let tag_string fmt o s =
match o with
- None -> pp_print_string fmt s
+ None -> Format.pp_print_string fmt s
| Some tag ->
- pp_open_tag fmt tag;
- pp_print_string fmt s;
- pp_close_tag fmt ()
+ Format.pp_open_stag fmt (Format.String_tag tag);
+ Format.pp_print_string fmt s;
+ Format.pp_close_stag fmt ()
let rec fprint_t fmt = function
Atom (s, p) ->
@@ -354,12 +357,12 @@
List.iter (
fun x ->
if p.space_before_separator then
- pp_print_string fmt " ";
+ Format.pp_print_string fmt " ";
tag_string fmt p.separator_style sep;
if p.space_after_separator then
- pp_print_space fmt ()
+ Format.pp_print_space fmt ()
else
- pp_print_cut fmt ();
+ Format.pp_print_cut fmt ();
fprint_t fmt x
) tl;
close_tag fmt p.body_style
@@ -370,12 +373,12 @@
List.iter (
fun x ->
if p.space_before_separator then
- pp_print_space fmt ()
+ Format.pp_print_space fmt ()
else
- pp_print_cut fmt ();
+ Format.pp_print_cut fmt ();
tag_string fmt p.separator_style sep;
if p.space_after_separator then
- pp_print_string fmt " ";
+ Format.pp_print_string fmt " ";
fprint_t fmt x
) tl;
close_tag fmt p.body_style
@@ -387,7 +390,7 @@
fprint_t fmt lab;
close_tag fmt lp.label_style;
if lp.space_after_label then
- pp_print_string fmt " "
+ Format.pp_print_string fmt " "
(* Either horizontal or vertical list *)
and fprint_list fmt label ((op, _sep, cl, p) as param) = function
@@ -395,7 +398,7 @@
fprint_opt_label fmt label;
tag_string fmt p.opening_style op;
if p.space_after_opening || p.space_before_closing then
- pp_print_string fmt " ";
+ Format.pp_print_string fmt " ";
tag_string fmt p.closing_style cl
| hd :: tl as l ->
@@ -414,9 +417,9 @@
tag_string fmt p.opening_style op;
if p.space_after_opening then
- pp_print_space fmt ()
+ Format.pp_print_space fmt ()
else
- pp_print_cut fmt ();
+ Format.pp_print_cut fmt ();
let open_extra, close_extra = extra_box p l in
open_extra fmt;
@@ -424,11 +427,11 @@
close_extra fmt;
if p.space_before_closing then
- pp_print_break fmt 1 (-indent)
+ Format.pp_print_break fmt 1 (-indent)
else
- pp_print_break fmt 0 (-indent);
+ Format.pp_print_break fmt 0 (-indent);
tag_string fmt p.closing_style cl;
- pp_close_box fmt ()
+ Format.pp_close_box fmt ()
and fprint_list_stick_right fmt label (op, sep, cl, p) hd tl l =
let base_indent = p.indent_body in
@@ -443,9 +446,9 @@
tag_string fmt p.opening_style op;
if p.space_after_opening then
- pp_print_space fmt ()
+ Format.pp_print_space fmt ()
else
- pp_print_cut fmt ();
+ Format.pp_print_cut fmt ();
let open_extra, close_extra = extra_box p l in
open_extra fmt;
@@ -454,23 +457,23 @@
List.iter (
fun x ->
if p.space_before_separator then
- pp_print_break fmt 1 (-sep_indent)
+ Format.pp_print_break fmt 1 (-sep_indent)
else
- pp_print_break fmt 0 (-sep_indent);
+ Format.pp_print_break fmt 0 (-sep_indent);
tag_string fmt p.separator_style sep;
if p.space_after_separator then
- pp_print_string fmt " ";
+ Format.pp_print_string fmt " ";
fprint_t fmt x
) tl;
close_extra fmt;
if p.space_before_closing then
- pp_print_break fmt 1 (-indent)
+ Format.pp_print_break fmt 1 (-indent)
else
- pp_print_break fmt 0 (-indent);
+ Format.pp_print_break fmt 0 (-indent);
tag_string fmt p.closing_style cl;
- pp_close_box fmt ()
+ Format.pp_close_box fmt ()
@@ -479,23 +482,23 @@
[] ->
tag_string fmt p.opening_style op;
if p.space_after_opening || p.space_before_closing then
- pp_print_string fmt " ";
+ Format.pp_print_string fmt " ";
tag_string fmt p.closing_style cl
| hd :: tl as l ->
tag_string fmt p.opening_style op;
if p.space_after_opening then
- pp_print_string fmt " ";
+ Format.pp_print_string fmt " ";
pp_open_nonaligned_box fmt p 0 l ;
if p.separators_stick_left then
fprint_list_body_stick_left fmt p sep hd tl
else
fprint_list_body_stick_right fmt p sep hd tl;
- pp_close_box fmt ();
+ Format.pp_close_box fmt ();
if p.space_before_closing then
- pp_print_string fmt " ";
+ Format.pp_print_string fmt " ";
tag_string fmt p.closing_style cl
@@ -512,7 +515,7 @@
| _ ->
let indent = lp.indent_after_label in
- pp_open_hvbox fmt 0;
+ Format.pp_open_hvbox fmt 0;
open_tag fmt lp.label_style;
fprint_t fmt lab;
@@ -521,26 +524,26 @@
(match lp.label_break with
| `Auto ->
if lp.space_after_label then
- pp_print_break fmt 1 indent
+ Format.pp_print_break fmt 1 indent
else
- pp_print_break fmt 0 indent
+ Format.pp_print_break fmt 0 indent
| `Always
| `Always_rec ->
- pp_force_newline fmt ();
- pp_print_string fmt (String.make indent ' ')
+ Format.pp_force_newline fmt ();
+ Format.pp_print_string fmt (String.make indent ' ')
| `Never ->
if lp.space_after_label then
- pp_print_char fmt ' '
+ Format.pp_print_char fmt ' '
else
()
);
fprint_t fmt x;
- pp_close_box fmt ()
+ Format.pp_close_box fmt ()
let to_formatter fmt x =
let x = rewrite x in
fprint_t fmt x;
- pp_print_flush fmt ()
+ Format.pp_print_flush fmt ()
let to_buffer ?(escape = `None) ?(styles = []) buf x =
let fmt = Format.formatter_of_buffer buf in
@@ -553,7 +556,7 @@
Buffer.contents buf
let to_channel ?(escape = `None) ?(styles = []) oc x =
- let fmt = formatter_of_out_channel oc in
+ let fmt = Format.formatter_of_out_channel oc in
define_styles fmt escape styles;
to_formatter fmt x
@@ -575,9 +578,9 @@
| Label (label, x) -> fprint_pair buf label x
| Custom f ->
(* Will most likely not be compact *)
- let fmt = formatter_of_buffer buf in
+ let fmt = Format.formatter_of_buffer buf in
f fmt;
- pp_print_flush fmt ()
+ Format.pp_print_flush fmt ()
and fprint_list buf (op, sep, cl, _) = function
[] -> bprintf buf "%s%s" op cl
@@ -606,7 +609,7 @@
let to_formatter fmt x =
let s = to_string x in
Format.fprintf fmt "%s" s;
- pp_print_flush fmt ()
+ Format.pp_print_flush fmt ()
let to_channel oc x =
let buf = Buffer.create 500 in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-easy-format-1.3.2/test/dune
new/ocaml-easy-format-1.3.3/test/dune
--- old/ocaml-easy-format-1.3.2/test/dune 2019-08-02 07:28:25.000000000
+0200
+++ new/ocaml-easy-format-1.3.3/test/dune 2022-04-27 23:45:40.000000000
+0200
@@ -1,10 +1,3 @@
-(executable
+(test
(name test_easy_format)
(libraries easy-format))
-
-(alias
- (name runtest)
- (deps
- (:< test_easy_format.exe))
- (action
- (run %{<})))
