diff --git a/_service b/_service index 2ba8c03..6c8f2a3 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ ocaml-pyml - b6608db88f0559f7e59b9be859a649f5bb6812b7 + 5c61e0e898a9a6a2794d9c3e26484650f8c1dec6 git disable https://github.com/thierry-martinez/pyml.git diff --git a/ocaml-pyml-20210226.tar.xz b/ocaml-pyml-20210226.tar.xz deleted file mode 100644 index 789086f..0000000 --- a/ocaml-pyml-20210226.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:688e415142f6463d48ecbede0887863bb843b766d15afe173ad9ceabb21450f5 -size 67572 diff --git a/ocaml-pyml-20210924.tar.xz b/ocaml-pyml-20210924.tar.xz new file mode 100644 index 0000000..09504f6 --- /dev/null +++ b/ocaml-pyml-20210924.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4064515e7b8ab300433c61f20af7703d3fffd587bff084a632a7f490574b3a9 +size 69236 diff --git a/ocaml-pyml.changes b/ocaml-pyml.changes index 0514de9..e6d38a0 100644 --- a/ocaml-pyml.changes +++ b/ocaml-pyml.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Sep 11 12:34:56 UTC 2021 - ohering@suse.de + +- Update to version 20210924 + build with dune + ------------------------------------------------------------------- Tue Jun 15 15:15:15 UTC 2021 - ohering@suse.de diff --git a/ocaml-pyml.spec b/ocaml-pyml.spec index c70857b..b25885a 100644 --- a/ocaml-pyml.spec +++ b/ocaml-pyml.spec @@ -1,7 +1,7 @@ # # spec file for package ocaml-pyml # -# Copyright (c) 2018 SUSE LINUX 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 @@ -16,7 +16,7 @@ # Name: ocaml-pyml -Version: 20210226 +Version: 20210924 Release: 0 %{?ocaml_preserve_bytecode} Summary: Stdcompat: compatibility module for OCaml standard library @@ -25,10 +25,9 @@ Group: Development/Languages/OCaml URL: https://opam.ocaml.org/packages/pyml Source0: %{name}-%{version}.tar.xz BuildRequires: ocaml -#uildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20210409 +BuildRequires: ocaml-dune +BuildRequires: ocaml-rpm-macros >= 20210911 BuildRequires: ocamlfind(bigarray) -BuildRequires: ocamlfind(findlib) BuildRequires: ocamlfind(stdcompat) BuildRequires: ocamlfind(unix) # make check @@ -56,33 +55,17 @@ developing applications that use %{name}. %autosetup -p1 %build -sed -i~ ' -s@^\(HAVE_OCAMLFIND := $(shell \).*@\1 set -x ; \\@ -s@2>&1@@g -' Makefile -diff -u "$_"~ "$_" && exit 1 -%make_build -%if 0 +ocamlc -config dune_release_pkgs='pyml' %ocaml_dune_setup %ocaml_dune_build -%endif %install -mkdir -vp '%{buildroot}%{ocaml_standard_library}' -export OCAMLFIND_DESTDIR='%{buildroot}%{ocaml_standard_library}' -export OCAMLFIND_LDCONF='ignore' -%make_install STDCOMPAT="$(ocamlfind query stdcompat)" -%ocaml_create_file_list -%if 0 %ocaml_dune_install %ocaml_create_file_list -%endif %check -%if 0 %ocaml_dune_test -%endif %files -f %{name}.files