Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-cudf for openSUSE:Factory checked in at 2021-04-29 01:37:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-cudf (Old) and /work/SRC/openSUSE:Factory/.ocaml-cudf.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-cudf" Thu Apr 29 01:37:22 2021 rev:2 rq:885103 version:0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-cudf/ocaml-cudf.changes 2018-01-31 19:50:14.226093522 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml-cudf.new.12324/ocaml-cudf.changes 2021-04-29 01:38:08.354556228 +0200 @@ -1,0 +2,5 @@ +Fri Apr 9 09:09:09 UTC 2021 - [email protected] + +- Use ocaml-cudf.patch to build with dune instead of oasis + +------------------------------------------------------------------- Old: ---- cudf-0.9.tar.gz New: ---- _service ocaml-cudf-0.9.tar.xz ocaml-cudf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-cudf.spec ++++++ --- /var/tmp/diff_new_pack.BSkFiG/_old 2021-04-29 01:38:08.818556886 +0200 +++ /var/tmp/diff_new_pack.BSkFiG/_new 2021-04-29 01:38:08.818556886 +0200 @@ -1,7 +1,7 @@ # # spec file for package ocaml-cudf # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -21,19 +21,17 @@ Release: 0 %{?ocaml_preserve_bytecode} Summary: Ocaml CUDF library -License: GPL-3.0 +License: GPL-3.0-only Group: Development/Languages/OCaml -Url: http://www.mancoosi.org/cudf/ -Source0: cudf-%{version}.tar.gz +URL: https://opam.ocaml.org/packages/cudf +Source0: %{name}-%{version}.tar.xz Patch0: allow_underscore.patch -BuildRequires: glib2-devel +Patch1: ocaml-cudf.patch BuildRequires: ocaml -BuildRequires: ocaml-oasis -BuildRequires: ocaml-ocamldoc -BuildRequires: ocaml-rpm-macros >= 4.03 +BuildRequires: ocaml-dune +BuildRequires: ocaml-rpm-macros >= 20210409 BuildRequires: ocamlfind(extlib) -BuildRequires: perl -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: ocamlfind(stdlib-shims) %description CUDF (for Common Upgradeability Description Format) is a format for describing upgrade scenarios in package-based Free and Open Source Software distribution. This is reference implementation in Ocaml. @@ -47,99 +45,24 @@ The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. - %prep -%setup -q -n cudf-%{version} -%patch0 -p1 +%autosetup -p1 %build -rm -fv setup.ml myocamlbuild.ml META* _* */_* *.mllib *.odocl -# obs service changes every ^Version line ... -sh -c "sed 's/^Version.*/Version: %{version}/' | tee _oasis" <<_EOF_ -OASISFormat: 0.4 -Name: %{name} -Version: %{version} -Synopsis: Common Upgradeability Description Format -Authors: [email protected] -License: %{license} -Plugins: META(`oasis version`) -BuildTools: ocamlbuild - -Library cudf - Install: true - Path: . - BuildDepends: extlib - Modules: \ - Cudf, \ - Cudf_822_lexer, \ - Cudf_822_parser, \ - Cudf_c, \ - Cudf_checker, \ - Cudf_conf, \ - Cudf_parser, \ - Cudf_printer, \ - Cudf_type_lexer, \ - Cudf_type_parser, \ - Cudf_types, \ - Cudf_types_pp - -Document "cudf" - Title: API reference for cudf - Type: ocamlbuild - BuildTools+: ocamldoc - InstallDir: \$htmldir - Install: true - XOCamlbuildPath: . - XOCamlbuildLibraries: cudf - -Executable "cudf-check" - Path: . - Install: true - MainIs: main_cudf_check.ml - BuildDepends: cudf - -Executable "cudf-parse-822" - Path: . - Install: true - MainIs: main_cudf_parse_822.ml - BuildDepends: cudf -_EOF_ - -%oasis_setup -%ocaml_oasis_configure --enable-docs --enable-tests -%ocaml_oasis_build -%ocaml_oasis_doc +dune_release_pkgs='cudf' +%ocaml_dune_setup +%ocaml_dune_build %install -%ocaml_oasis_findlib_install +%ocaml_dune_install +%ocaml_create_file_list + +%check +%ocaml_dune_test -%files -%defattr(-,root,root) +%files -f %{name}.files %{_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/*/*.ml -%{_libdir}/ocaml/*/META +%files devel -f %{name}.files.devel %changelog ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="filename">ocaml-cudf</param> <param name="revision">915184fff3534ea35ee2d902ff7472527f9231a4</param> <param name="scm">git</param> <param name="submodules">disable</param> <param name="url">https://gforge.inria.fr/anonscm/git/cudf/cudf.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-cudf.patch ++++++ --- a/cudf.ml +++ b/cudf.ml @@ -73,10 +73,10 @@ let (=%) pkg1 pkg2 = pkg1.package = pkg2.package && pkg1.version = pkg2.version let (<%) pkg1 pkg2 = - Pervasives.compare (pkg1.package, pkg1.version) (pkg2.package, pkg2.version) + Stdlib.compare (pkg1.package, pkg1.version) (pkg2.package, pkg2.version) let (>%) pkg1 pkg2 = - Pervasives.compare (pkg2.package, pkg2.version) (pkg1.package, pkg1.version) + Stdlib.compare (pkg2.package, pkg2.version) (pkg1.package, pkg1.version) let default_preamble = { preamble_id = "" ; --- a/cudf.mli +++ b/cudf.mli @@ -40,7 +40,7 @@ type package = { val (=%) : package -> package -> bool (** Package comparison up to <name, version>. Same rules of package equality, - but providing a suitable replacement for [Pervasives.compare]; useful for + but providing a suitable replacement for [Stdlib.compare]; useful for sorting. *) val (<%) : package -> package -> int --- a/cudf_types_pp.ml +++ b/cudf_types_pp.ml @@ -101,10 +101,10 @@ let parse_value ty s = (** Pretty printers *) -let string_of_int = Pervasives.string_of_int +let string_of_int = Stdlib.string_of_int let string_of_posint = string_of_int let string_of_nat = string_of_int -let string_of_bool = Pervasives.string_of_bool +let string_of_bool = Stdlib.string_of_bool let string_of_keep = function `Keep_version -> "version" --- /dev/null +++ b/dune @@ -0,0 +1,32 @@ +(library + (public_name cudf) + (wrapped false) + (modules + Cudf + Cudf_822_lexer + Cudf_822_parser + Cudf_checker + Cudf_conf + Cudf_parser + Cudf_printer + Cudf_type_lexer + Cudf_type_parser + Cudf_types + Cudf_types_pp) + (libraries extlib stdlib-shims)) + +(executable + (name main_cudf_check) + (public_name cudf-check) + (modules Main_cudf_check) + (libraries cudf)) + +(executable + (name main_cudf_parse_822) + (public_name cudf-parse-822) + (modules Main_cudf_parse_822) + (libraries cudf)) + +(ocamllex cudf_type_lexer cudf_822_lexer) + +(ocamlyacc cudf_type_parser cudf_822_parser) --- /dev/null +++ b/dune-project @@ -0,0 +1,25 @@ +(lang dune 1.10) + +(generate_opam_files true) + +(license "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception") + +(authors "Roberto di Cosmo <[email protected]>, Stefano Zacchiroli, Pietro Abate") + +(maintainers "[email protected]") + +(homepage "http://www.mancoosi.org/cudf/";) + +(bug_reports + "https://gforge.inria.fr/tracker/?atid=13811&group_id=4385&func=browse";) + +(package + (name cudf) + (synopsis "CUDF library (part of the Mancoosi tools)") + (description + "CUDF (for Common Upgradeability Description Format) is a format for describing upgrade scenarios in package-based Free and Open Source Software distribution.") + (depends + dune + extlib + (ocaml + (>= 4.02.0))))
