Hello community, here is the log from the commit of package ocaml-gettext for openSUSE:Factory checked in at 2020-08-24 15:06:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-gettext (Old) and /work/SRC/openSUSE:Factory/.ocaml-gettext.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-gettext" Mon Aug 24 15:06:32 2020 rev:5 rq:828685 version:0.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-gettext/ocaml-gettext.changes 2019-11-13 13:15:04.810870194 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml-gettext.new.3399/ocaml-gettext.changes 2020-08-24 15:06:56.910506508 +0200 @@ -1,0 +2,6 @@ +Thu Aug 20 20:20:20 UTC 2020 - [email protected] + +- Update to version 0.4.2 + Compatibility with OCaml 4.11 + +------------------------------------------------------------------- Old: ---- ocaml-gettext-0.4.1.tar.xz New: ---- ocaml-gettext-0.4.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-gettext.spec ++++++ --- /var/tmp/diff_new_pack.mlv1K6/_old 2020-08-24 15:06:58.410507239 +0200 +++ /var/tmp/diff_new_pack.mlv1K6/_new 2020-08-24 15:06:58.414507241 +0200 @@ -1,7 +1,7 @@ # # spec file for package ocaml-gettext # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,20 @@ Name: ocaml-gettext -Version: 0.4.1 +Version: 0.4.2 Release: 0 %{?ocaml_preserve_bytecode} Summary: OCaml library for i18n License: SUSE-LGPL-2.0-with-linking-exception Group: Development/Languages/OCaml -Url: https://github.com/gildor478/ocaml-gettext +URL: https://opam.ocaml.org/packages/gettext Source0: %{name}-%{version}.tar.xz BuildRequires: ocaml BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20191101 +BuildRequires: ocaml-rpm-macros >= 20200514 BuildRequires: ocamlfind(camomile) BuildRequires: ocamlfind(compiler-libs.common) +BuildRequires: ocamlfind(cppo) BuildRequires: ocamlfind(dune.configurator) BuildRequires: ocamlfind(fileutils) BuildRequires: ocamlfind(oUnit) @@ -39,12 +40,12 @@ # Obsoletes: ocaml-gettext-camomile < %{version}-%{release} Obsoletes: ocaml-gettext-stub < %{version}-%{release} -Obsoletes: ocaml-gettext-stub-devel < %{version}-%{release} Obsoletes: ocaml-gettext-stub-debuginfo < %{version}-%{release} +Obsoletes: ocaml-gettext-stub-devel < %{version}-%{release} Provides: ocaml-gettext-camomile = %{version}-%{release} Provides: ocaml-gettext-stub = %{version}-%{release} -Provides: ocaml-gettext-stub-devel = %{version}-%{release} Provides: ocaml-gettext-stub-debuginfo = %{version}-%{release} +Provides: ocaml-gettext-stub-devel = %{version}-%{release} %description Ocaml-gettext provides support for internationalization of Ocaml ++++++ _service ++++++ --- /var/tmp/diff_new_pack.mlv1K6/_old 2020-08-24 15:06:58.442507255 +0200 +++ /var/tmp/diff_new_pack.mlv1K6/_new 2020-08-24 15:06:58.442507255 +0200 @@ -1,12 +1,14 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="url">https://github.com/gildor478/ocaml-gettext.git</param> - <param name="scm">git</param> - <param name="versionformat">0.4.1</param> - <!-- v0.4.1 --> - <param name="revision">a74be839b4e1305a538e2838f5700b5a7907a197</param> - <param name="filename">ocaml-gettext</param> <param name="exclude">patches</param> + <param name="filename">ocaml-gettext</param> + <param name="revision">9b7afc702bccace9a544b8efa2a28bc2b13371ed</param> + <param name="scm">git</param> + <param name="submodules">disable</param> + <param name="url">https://github.com/gildor478/ocaml-gettext.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-gettext-0.4.1.tar.xz -> ocaml-gettext-0.4.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-gettext-0.4.1/CHANGES.md new/ocaml-gettext-0.4.2/CHANGES.md --- old/ocaml-gettext-0.4.1/CHANGES.md 2019-10-02 08:56:31.000000000 +0200 +++ new/ocaml-gettext-0.4.2/CHANGES.md 2020-06-11 22:40:42.000000000 +0200 @@ -1,3 +1,8 @@ +## v0.4.2 - 2020-06-11 + +### Fixed +- Compatibility with OCaml 4.11. (Thanks to kit-ty-kate, closes: #8) + ## v0.4.1 - 2019-10-02 ### Fixed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-gettext-0.4.1/README.md new/ocaml-gettext-0.4.2/README.md --- old/ocaml-gettext-0.4.1/README.md 2019-10-02 08:56:31.000000000 +0200 +++ new/ocaml-gettext-0.4.2/README.md 2020-06-11 22:40:42.000000000 +0200 @@ -35,7 +35,7 @@ The recommended way to install ocaml-gettext is via the [opam package manager][opam]: ```sh -$ opam install ounit +$ opam install gettext gettext-camomile gettext-stub ``` Documentation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-gettext-0.4.1/gettext-stub.opam new/ocaml-gettext-0.4.2/gettext-stub.opam --- old/ocaml-gettext-0.4.1/gettext-stub.opam 2019-10-02 08:56:31.000000000 +0200 +++ new/ocaml-gettext-0.4.2/gettext-stub.opam 2020-06-11 22:40:42.000000000 +0200 @@ -18,6 +18,7 @@ depends: [ "ocaml" {>= "4.03.0"} "dune" {>= "1.11.0"} + "dune-configurator" "base-bytes" "gettext" {= version} "ounit" {with-test & > "2.0.8"} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-gettext-0.4.1/gettext.opam new/ocaml-gettext-0.4.2/gettext.opam --- old/ocaml-gettext-0.4.1/gettext.opam 2019-10-02 08:56:31.000000000 +0200 +++ new/ocaml-gettext-0.4.2/gettext.opam 2020-06-11 22:40:42.000000000 +0200 @@ -18,6 +18,7 @@ depends: [ "ocaml" {>= "4.03.0"} "dune" {>= "1.11.0"} + "cppo" {build} "fileutils" "base-bytes" "ounit" {with-test & > "2.0.8"} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-gettext-0.4.1/src/bin/ocaml-xgettext/dune new/ocaml-gettext-0.4.2/src/bin/ocaml-xgettext/dune --- old/ocaml-gettext-0.4.1/src/bin/ocaml-xgettext/dune 2019-10-02 08:56:31.000000000 +0200 +++ new/ocaml-gettext-0.4.2/src/bin/ocaml-xgettext/dune 2020-06-11 22:40:42.000000000 +0200 @@ -2,4 +2,5 @@ (name xgettext) (public_name ocaml-xgettext) (package gettext) + (preprocess (action (run %{bin:cppo} -V OCAML:%{ocaml_version} %{input-file}))) (libraries compiler-libs.common gettext.base gettext.extension)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-gettext-0.4.1/src/bin/ocaml-xgettext/xgettext.ml new/ocaml-gettext-0.4.2/src/bin/ocaml-xgettext/xgettext.ml --- old/ocaml-gettext-0.4.1/src/bin/ocaml-xgettext/xgettext.ml 2019-10-02 08:56:31.000000000 +0200 +++ new/ocaml-gettext-0.4.2/src/bin/ocaml-xgettext/xgettext.ml 2020-06-11 22:40:42.000000000 +0200 @@ -121,7 +121,11 @@ | Pexp_apply ( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ }, ( Asttypes.Nolabel, +#if OCAML_VERSION >= (4, 11, 0) + { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ } ) +#else { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ } ) +#endif :: _ ) when is_like lid [ "s_"; "f_" ] -> (* Add a singular / default domain string *) @@ -129,9 +133,17 @@ | Pexp_apply ( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ }, ( Asttypes.Nolabel, +#if OCAML_VERSION >= (4, 11, 0) + { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ } ) +#else { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ } ) +#endif :: ( Asttypes.Nolabel, +#if OCAML_VERSION >= (4, 11, 0) + { pexp_desc = Pexp_constant (Pconst_string (plural, _, _)); _ } ) +#else { pexp_desc = Pexp_constant (Pconst_string (plural, _)); _ } ) +#endif :: _ ) when is_like lid [ "sn_"; "fn_" ] -> (* Add a plural / default domain string *) @@ -140,7 +152,11 @@ ( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ }, _ :: ( Asttypes.Nolabel, +#if OCAML_VERSION >= (4, 11, 0) + { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ } ) +#else { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ } ) +#endif :: _ ) when is_like lid [ "gettext"; "fgettext" ] -> (* Add a singular / default domain string *) @@ -149,9 +165,17 @@ ( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ }, _ :: ( Asttypes.Nolabel, +#if OCAML_VERSION >= (4, 11, 0) + { pexp_desc = Pexp_constant (Pconst_string (domain, _, _)); _ } ) +#else { pexp_desc = Pexp_constant (Pconst_string (domain, _)); _ } ) +#endif :: ( Asttypes.Nolabel, +#if OCAML_VERSION >= (4, 11, 0) + { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ } +#else { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ } +#endif ) :: _ ) when is_like lid [ "dgettext"; "fdgettext"; "dcgettext"; "fdcgettext" ] -> @@ -161,9 +185,17 @@ ( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ }, _ :: ( Asttypes.Nolabel, +#if OCAML_VERSION >= (4, 11, 0) + { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ } ) +#else { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ } ) +#endif :: ( Asttypes.Nolabel, +#if OCAML_VERSION >= (4, 11, 0) + { pexp_desc = Pexp_constant (Pconst_string (plural, _, _)); _ } ) +#else { pexp_desc = Pexp_constant (Pconst_string (plural, _)); _ } ) +#endif :: _ ) when is_like lid [ "ngettext"; "fngettext" ] -> (* Add a plural / default domain string *) @@ -172,12 +204,24 @@ ( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ }, _ :: ( Asttypes.Nolabel, +#if OCAML_VERSION >= (4, 11, 0) + { pexp_desc = Pexp_constant (Pconst_string (domain, _, _)); _ } ) +#else { pexp_desc = Pexp_constant (Pconst_string (domain, _)); _ } ) +#endif :: ( Asttypes.Nolabel, +#if OCAML_VERSION >= (4, 11, 0) + { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ } +#else { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ } +#endif ) :: ( Asttypes.Nolabel, +#if OCAML_VERSION >= (4, 11, 0) + { pexp_desc = Pexp_constant (Pconst_string (plural, _, _)); _ } +#else { pexp_desc = Pexp_constant (Pconst_string (plural, _)); _ } +#endif ) :: _ ) when is_like lid [ "dngettext"; "fdngettext"; "dcngettext"; "fdcngettext" ]
