- Initial version 20200222

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-pyml?expand=0&rev=6

_service

@@ -1,11 +1,13 @@
 <services>
   <service name="tar_scm" mode="disabled">
-    <param name="url">https://github.com/thierry-martinez/pyml.git</param>
-    <param name="scm">git</param>
-    <param name="versionformat">@PARENT_TAG@</param>
-    <!-- 20200115 -->
-    <param name="revision">11d683e1d641c987ae9f5995508410cf37a2a685</param>
     <param name="filename">ocaml-pyml</param>
+    <param name="revision">1d57cda1722aacde90ff318bf9a7bcc8a50eeed6</param>
+    <param name="scm">git</param>
+    <param name="submodules">disable</param>
+    <param name="url">https://github.com/thierry-martinez/pyml.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-pyml-20200115.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8a86ab1462a8050ac9f855fba65e081de4007df850bc0184f9362d0943453431
-size 65496

ocaml-pyml-20200222.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:10b7588eb85de25e79d5849f7090fbaaf4c512bdc2e880d4f88302e5db09376e
+size 65656

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
 

ocaml-pyml.patch

@@ -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
- 

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
+#uildRequires:  ocaml-dune
-BuildRequires:  ocaml-rpm-macros >= 20191101
+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'
+mkdir -vp '%{buildroot}%{ocaml_standard_library}'
-%make_install OCAMLFIND_EXTRA_OPTIONS='-destdir %{buildroot}%{_libdir}/ocaml -ldconf ignore' STDCOMPAT="$(ocamlfind query stdcompat)"
+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