diff --git a/_service b/_service index d3fef08..f508c9b 100644 --- a/_service +++ b/_service @@ -1,11 +1,13 @@ - https://github.com/thierry-martinez/pyml.git - git - @PARENT_TAG@ - - 11d683e1d641c987ae9f5995508410cf37a2a685 ocaml-pyml + 1d57cda1722aacde90ff318bf9a7bcc8a50eeed6 + git + disable + https://github.com/thierry-martinez/pyml.git + @PARENT_TAG@ + [v]?([^+]+)(.*) + \1 *.tar diff --git a/ocaml-pyml-20200115.tar.xz b/ocaml-pyml-20200115.tar.xz deleted file mode 100644 index 5eab990..0000000 --- a/ocaml-pyml-20200115.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8a86ab1462a8050ac9f855fba65e081de4007df850bc0184f9362d0943453431 -size 65496 diff --git a/ocaml-pyml-20200222.tar.xz b/ocaml-pyml-20200222.tar.xz new file mode 100644 index 0000000..3350b9e --- /dev/null +++ b/ocaml-pyml-20200222.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10b7588eb85de25e79d5849f7090fbaaf4c512bdc2e880d4f88302e5db09376e +size 65656 diff --git a/ocaml-pyml.changes b/ocaml-pyml.changes index 958547b..7517aba 100644 --- a/ocaml-pyml.changes +++ b/ocaml-pyml.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Sat Feb 15 14:13:12 UTC 2020 - ohering@suse.de +Thu Feb 20 20:20:20 UTC 2020 - ohering@suse.de -- Initial version 20200115 +- Initial version 20200222 diff --git a/ocaml-pyml.patch b/ocaml-pyml.patch deleted file mode 100644 index 7137d99..0000000 --- a/ocaml-pyml.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/Makefile b/Makefile -index e78ffa9..4b8555c 100644 ---- a/Makefile -+++ b/Makefile -@@ -207,13 +207,13 @@ install : $(INSTALL_FILES) - ifeq ($(HAVE_OCAMLFIND),no) - $(error ocamlfind is needed for 'make install') - endif -- $(OCAMLFIND) install pyml $(INSTALL_FILES) -+ $(OCAMLFIND) install $(OCAMLFIND_EXTRA_OPTIONS) pyml $(INSTALL_FILES) - [ ! -f pymltop ] || $(INSTALL_PROGRAM) pymltop $(bindir)/pymltop - [ ! -f pymlutop ] || $(INSTALL_PROGRAM) pymlutop $(bindir)/pymlutop - - .PHONY : uninstall - uninstall : -- $(OCAMLFIND) remove pyml -+ $(OCAMLFIND) remove $(OCAMLFIND_EXTRA_OPTIONS) pyml - - rm $(bindir)/pymltop - - rm $(bindir)/pymlutop - diff --git a/ocaml-pyml.spec b/ocaml-pyml.spec index 2f24c54..2fa4bb6 100644 --- a/ocaml-pyml.spec +++ b/ocaml-pyml.spec @@ -16,7 +16,7 @@ # Name: ocaml-pyml -Version: 20200115 +Version: 20200222 Release: 0 %{?ocaml_preserve_bytecode} Summary: Stdcompat: compatibility module for OCaml standard library @@ -24,10 +24,9 @@ License: BSD-2-Clause Group: Development/Languages/OCaml URL: https://opam.ocaml.org/packages/pyml Source0: %{name}-%{version}.tar.xz -Patch0: ocaml-pyml.patch BuildRequires: ocaml -BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20191101 +#uildRequires: ocaml-dune +BuildRequires: ocaml-rpm-macros >= 20200220 BuildRequires: ocamlfind(bigarray) BuildRequires: ocamlfind(findlib) BuildRequires: ocamlfind(stdcompat) @@ -65,8 +64,10 @@ dune_release_pkgs='pyml' %ocaml_dune_build %install -mkdir -vp '%{buildroot}%{_libdir}/ocaml' -%make_install OCAMLFIND_EXTRA_OPTIONS='-destdir %{buildroot}%{_libdir}/ocaml -ldconf ignore' STDCOMPAT="$(ocamlfind query stdcompat)" +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 exit 0 %ocaml_dune_install