Hello community, here is the log from the commit of package ocaml-sedlex for openSUSE:Factory checked in at 2019-11-08 15:24:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-sedlex (Old) and /work/SRC/openSUSE:Factory/.ocaml-sedlex.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-sedlex" Fri Nov 8 15:24:13 2019 rev:3 rq:743636 version:2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-sedlex/ocaml-sedlex.changes 2019-01-11 14:06:50.335718557 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml-sedlex.new.2990/ocaml-sedlex.changes 2019-11-08 15:24:16.294902448 +0100 @@ -1,0 +2,16 @@ +Tue Oct 29 04:46:58 UTC 2019 - Andy Li <a...@onthewings.net> + +- New upstream version. + + Auto-generate unicode data. + + Switch to dune for building. + + Switch from int codepoints to Uchar.t codepoints. + + Track lexing position. +- Remove ppx_tools_versioned-521.patch. +- Add unicode-data.diff to use unicode data files from unicode-ucd. + +------------------------------------------------------------------- +Fri Feb 8 03:01:27 UTC 2019 - a...@onthewings.net + +- Remove make parallel build. + +------------------------------------------------------------------- Old: ---- ocaml-sedlex-1.99.4.tar.gz ppx_tools_versioned-521.patch New: ---- ocaml-sedlex-2.1.tar.gz unicode-data.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-sedlex.spec ++++++ --- /var/tmp/diff_new_pack.9pGkwv/_old 2019-11-08 15:24:16.930903120 +0100 +++ /var/tmp/diff_new_pack.9pGkwv/_new 2019-11-08 15:24:16.930903120 +0100 @@ -1,7 +1,7 @@ # # spec file for package ocaml-sedlex # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,12 +12,12 @@ # 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/ # Name: ocaml-sedlex -Version: 1.99.4 +Version: 2.1 Release: 0 %{?ocaml_preserve_bytecode} Summary: Unicode-friendly lexer generator @@ -28,17 +28,18 @@ Source0: https://github.com/alainfrisch/sedlex/archive/v%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -# https://github.com/ocaml-community/sedlex/issues/64#issuecomment-433198249 -Patch0: ppx_tools_versioned-521.patch +# Use unicode data files from unicode-ucd +Patch0: unicode-data.diff BuildRequires: ocaml +BuildRequires: ocaml-dune BuildRequires: ocaml-findlib BuildRequires: ocaml-gen-devel BuildRequires: ocaml-migrate-parsetree-devel -BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-ppx_tools_versioned-devel BuildRequires: ocaml-result-devel -BuildRequires: ocaml-rpm-macros +BuildRequires: ocaml-rpm-macros >= 20190930 +BuildRequires: unicode-ucd %description A lexer generator for OCaml, similar to ocamllex, but supporting Unicode. @@ -61,50 +62,20 @@ %patch0 -p1 %build -make %{?_smp_mflags} - -%if 0%{?ocaml_native_compiler} -make %{?_smp_mflags} opt -%endif +%ocaml_dune_setup +%ocaml_dune_build %install -export DESTDIR=$RPM_BUILD_ROOT -export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml -mkdir -p $OCAMLFIND_DESTDIR - -# don't use make_install macro since it passes INSTALL, -# which is used differently in the Makefile -%if 0%{?ocaml_native_compiler} -make install -%else -make install_byteonly -%endif +%ocaml_dune_install +%ocaml_create_file_list -%files -%defattr(-,root,root,-) -%doc README.md CHANGES -%license LICENSE -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/*/ -%{_libdir}/ocaml/*/ppx_sedlex -%if 0%{?ocaml_native_compiler} -%{_libdir}/ocaml/*/*.cmxs -%{_libdir}/ocaml/*/ppx_sedlex.opt -%endif +%check +%ocaml_dune_test -%files devel -%defattr(-,root,root,-) +%files -f %{name}.files %doc README.md CHANGES %license LICENSE -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/*/ -%if 0%{?ocaml_native_compiler} -%{_libdir}/ocaml/*/*.a -%{_libdir}/ocaml/*/*.cmx -%{_libdir}/ocaml/*/*.cmxa -%endif -%{_libdir}/ocaml/*/*.cma -%{_libdir}/ocaml/*/*.cmi -%{_libdir}/ocaml/*/META + +%files devel -f %{name}.files.devel %changelog ++++++ ocaml-sedlex-1.99.4.tar.gz -> ocaml-sedlex-2.1.tar.gz ++++++ ++++ 7832 lines of diff (skipped) ++++++ unicode-data.diff ++++++ diff --git a/examples/regressions.ml b/examples/regressions.ml index fd5c873..d0c189f 100644 --- a/examples/regressions.ml +++ b/examples/regressions.ml @@ -57,8 +57,6 @@ let test new_l (name, old_l) = compare name old_l (List.assoc name new_l) let () = - if (Unicode_old.version,Sedlex_ppx.Unicode.version) <> test_versions then - failwith (Printf.sprintf "Test written for versions: %s => %s\n%!" Unicode_old.version Sedlex_ppx.Unicode.version); Printf.printf "Testing Unicode regression: %s => %s\n%!" Unicode_old.version Sedlex_ppx.Unicode.version; List.iter (test Sedlex_ppx.Unicode.Categories.list) Unicode_old.Categories.list; List.iter (test Sedlex_ppx.Unicode.Properties.list) Unicode_old.Properties.list diff --git a/src/generator/data/dune b/src/generator/data/dune index 785db95..666a776 100644 --- a/src/generator/data/dune +++ b/src/generator/data/dune @@ -1,14 +1,14 @@ (rule (targets DerivedCoreProperties.txt) (deps base_url) - (action (run curl -L -s %{read:base_url}/ucd/DerivedCoreProperties.txt -o DerivedCoreProperties.txt))) + (action (run cp /usr/share/unicode/ucd/DerivedCoreProperties.txt DerivedCoreProperties.txt))) (rule (targets DerivedGeneralCategory.txt) (deps base_url) - (action (run curl -L -s %{read:base_url}/ucd/extracted/DerivedGeneralCategory.txt -o DerivedGeneralCategory.txt))) + (action (run cp /usr/share/unicode/ucd/extracted/DerivedGeneralCategory.txt DerivedGeneralCategory.txt))) (rule (targets PropList.txt) (deps base_url) - (action (run curl -L -s %{read:base_url}/ucd/PropList.txt -o PropList.txt))) + (action (run cp /usr/share/unicode/ucd/PropList.txt PropList.txt)))
