Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-cppo for openSUSE:Factory checked in at 2021-04-29 01:36:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-cppo (Old) and /work/SRC/openSUSE:Factory/.ocaml-cppo.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-cppo" Thu Apr 29 01:36:43 2021 rev:9 rq:867929 version:1.6.7 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-cppo/ocaml-cppo.changes 2020-03-09 14:13:50.910524966 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml-cppo.new.12324/ocaml-cppo.changes 2021-04-29 01:37:10.690474495 +0200 @@ -1,0 +2,6 @@ +Thu Jan 21 21:21:21 UTC 2021 - [email protected] + +- Update to version 1.6.7 + See included Changes for details + +------------------------------------------------------------------- Old: ---- ocaml-cppo-1.6.6.tar.xz New: ---- ocaml-cppo-1.6.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-cppo.spec ++++++ --- /var/tmp/diff_new_pack.vK4Wez/_old 2021-04-29 01:37:11.090475062 +0200 +++ /var/tmp/diff_new_pack.vK4Wez/_new 2021-04-29 01:37:11.090475062 +0200 @@ -1,8 +1,7 @@ # # spec file for package ocaml-cppo # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2018 The openSUSE Project. +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2015 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -19,17 +18,17 @@ Name: ocaml-cppo -Version: 1.6.6 +Version: 1.6.7 Release: 0 %{?ocaml_preserve_bytecode} Summary: The C preprocessor written in OCaml License: BSD-3-Clause Group: Development/Languages/OCaml -Url: https://github.com/ocaml-community/cppo +URL: https://opam.ocaml.org/packages/cppo Source: %{name}-%{version}.tar.xz BuildRequires: ocaml BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20200220 +BuildRequires: ocaml-rpm-macros >= 20210121 BuildRequires: ocamlfind(str) BuildRequires: ocamlfind(unix) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.vK4Wez/_old 2021-04-29 01:37:11.122475108 +0200 +++ /var/tmp/diff_new_pack.vK4Wez/_new 2021-04-29 01:37:11.122475108 +0200 @@ -1,10 +1,13 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="url">https://github.com/ocaml-community/cppo.git</param> - <param name="scm">git</param> - <param name="versionformat">1.6.6</param> - <param name="revision">v1.6.6</param> <param name="filename">ocaml-cppo</param> + <param name="revision">7d217864a5fdc4551699e248137a2f8b719d2078</param> + <param name="scm">git</param> + <param name="submodules">disable</param> + <param name="url">https://github.com/ocaml-community/cppo.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-cppo-1.6.6.tar.xz -> ocaml-cppo-1.6.7.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.6.6/Changes new/ocaml-cppo-1.6.7/Changes --- old/ocaml-cppo-1.6.6/Changes 2019-05-27 01:49:42.000000000 +0200 +++ new/ocaml-cppo-1.6.7/Changes 2020-12-21 17:28:42.000000000 +0100 @@ -1,3 +1,8 @@ +## v1.6.7 (2020-12-21) +- [compat] Treat ~ and - the same in semver in order to parse + OCaml 4.12.0 pre-release versions. +- [compat] Restore 4.02.3 compatibility. + ## v1.6.6 (2019-05-27) - [pkg] port build system to dune from jbuilder. - [pkg] upgrade opam metadata to 2.0 format. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.6.6/INSTALL.md new/ocaml-cppo-1.6.7/INSTALL.md --- old/ocaml-cppo-1.6.6/INSTALL.md 2019-05-27 01:49:42.000000000 +0200 +++ new/ocaml-cppo-1.6.7/INSTALL.md 2020-12-21 17:28:42.000000000 +0100 @@ -13,11 +13,5 @@ Install: ``` -make PREFIX=/some/path install -``` - -or - -``` -make BINDIR=/some/path/bin install +make DESTDIR=/some/path install ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.6.6/cppo.opam new/ocaml-cppo-1.6.7/cppo.opam --- old/ocaml-cppo-1.6.6/cppo.opam 2019-05-27 01:49:42.000000000 +0200 +++ new/ocaml-cppo-1.6.7/cppo.opam 2020-12-21 17:28:42.000000000 +0100 @@ -2,12 +2,12 @@ maintainer: "[email protected]" authors: "Martin Jambon" license: "BSD-3-Clause" -homepage: "http://mjambon.com/cppo.html"; +homepage: "https://github.com/ocaml-community/cppo"; doc: "https://ocaml-community.github.io/cppo/"; bug-reports: "https://github.com/ocaml-community/cppo/issues"; depends: [ - "ocaml" {>= "4.03"} - "dune" {build & >= "1.0"} + "ocaml" {>= "4.02.3"} + "dune" {>= "1.0"} "base-unix" ] build: [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.6.6/cppo_ocamlbuild.opam new/ocaml-cppo-1.6.7/cppo_ocamlbuild.opam --- old/ocaml-cppo-1.6.6/cppo_ocamlbuild.opam 2019-05-27 01:49:42.000000000 +0200 +++ new/ocaml-cppo-1.6.7/cppo_ocamlbuild.opam 2020-12-21 17:28:42.000000000 +0100 @@ -2,13 +2,14 @@ maintainer: "[email protected]" authors: "Martin Jambon" license: "BSD-3-Clause" -homepage: "http://mjambon.com/cppo.html"; +homepage: "https://github.com/ocaml-community/cppo"; doc: "https://ocaml-community.github.io/cppo/"; bug-reports: "https://github.com/ocaml-community/cppo/issues"; depends: [ "ocaml" - "dune" {build & >= "1.0"} + "dune" {>= "1.0"} "ocamlbuild" + "ocamlfind" ] build: [ ["dune" "subst"] {pinned} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.6.6/src/compat.ml new/ocaml-cppo-1.6.7/src/compat.ml --- old/ocaml-cppo-1.6.6/src/compat.ml 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-cppo-1.6.7/src/compat.ml 2020-12-21 17:28:42.000000000 +0100 @@ -0,0 +1,7 @@ +if Filename.check_suffix Sys.argv.(1) ".ml" && + Scanf.sscanf Sys.ocaml_version "%d.%d" (fun a b -> (a, b)) < (4, 03) then + print_endline "\ +module String = struct + include String + let capitalize_ascii = capitalize +end" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.6.6/src/cppo_main.ml new/ocaml-cppo-1.6.7/src/cppo_main.ml --- old/ocaml-cppo-1.6.6/src/cppo_main.ml 2019-05-27 01:49:42.000000000 +0200 +++ new/ocaml-cppo-1.6.7/src/cppo_main.ml 2020-12-21 17:28:42.000000000 +0100 @@ -18,7 +18,7 @@ \\([0-9]+\\)\ \\.\\([0-9]+\\)\ \\.\\([0-9]+\\)\ -\\(-\\([^+]*\\)\\)?\ +\\([~-]\\([^+]*\\)\\)?\ \\(\\+\\(.*\\)\\)?\ \r?$" @@ -108,6 +108,10 @@ VAR_VERSION_FULL is the original string Example: cppo -V OCAML:4.02.1 + + Note that cppo recognises both '-' and '~' preceding the pre-release + meaning -V OCAML:4.11.0+alpha1 sets OCAML_BUILD to alpha1 but + -V OCAML:4.12.0~alpha1 sets OCAML_PRERELEASE to alpha1. "; "-o", Arg.String (fun s -> out_file := Some s), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-cppo-1.6.6/src/dune new/ocaml-cppo-1.6.7/src/dune --- old/ocaml-cppo-1.6.6/src/dune 2019-05-27 01:49:42.000000000 +0200 +++ new/ocaml-cppo-1.6.7/src/dune 2020-12-21 17:28:42.000000000 +0100 @@ -13,4 +13,9 @@ (name cppo_main) (package cppo) (public_name cppo) + (modules :standard \ compat) + (preprocess (per_module + ((action (progn + (run ocaml %{dep:compat.ml} %{input-file}) + (cat %{input-file}))) cppo_eval))) (libraries unix str))
