Accepting request 887307 from devel:languages:ocaml

- Require current ocaml-rpm-macros
- Update to upstream version 1.9.1
   Fix an incomaptibility with ocaml-4.13
   Switch from m4 to sed
- Remove ocaml_native_compiler conditional
  build native target unconditionally

OBS-URL: https://build.opensuse.org/request/show/887307
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ocaml-findlib?expand=0&rev=11

_service

@@ -2,8 +2,8 @@
   <service name="tar_scm" mode="disabled">
     <param name="url">https://github.com/ocaml/ocamlfind.git</param>
     <param name="scm">git</param>
-    <param name="versionformat">1.8.1</param>
-    <param name="revision">findlib-1.8.1</param>
+    <param name="versionformat">1.9.1</param>
+    <param name="revision">findlib-1.9.1</param>
     <param name="filename">ocaml-findlib</param>
   </service>
   <service name="recompress" mode="disabled">

findlib-1.8.1.tar.xz

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

findlib-1.9.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:116311a9a2aee7ff09e399f468bc9b1cecb5bc939f5c001529c035aba0b48a83
+size 169048

ocaml-findlib.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Apr  9 09:09:09 UTC 2021 - ohering@suse.de
+
+- Require current ocaml-rpm-macros
+- Update to upstream version 1.9.1
+   Fix an incomaptibility with ocaml-4.13
+   Switch from m4 to sed
+- Remove ocaml_native_compiler conditional
+  build native target unconditionally
+
 -------------------------------------------------------------------
 Thu Feb 20 20:20:20 UTC 2020 - ohering@suse.de
 

ocaml-findlib.spec

@@ -18,13 +18,13 @@
 
 
 Name:           ocaml-findlib
-Version:        1.8.1
+Version:        1.9.1
 Release:        0
 %{?ocaml_preserve_bytecode}
 Summary:        Objective CAML package manager and build helper
 License:        MIT
 Group:          Development/Languages/OCaml
-
+BuildRoot:      %_tmppath/%name-%version-build
 Url:            https://github.com/ocaml/ocamlfind
 Source0:        findlib-%{version}.tar.xz
 #
@@ -32,12 +32,9 @@ Requires:       ocaml-compiler-libs
 Requires:       ocaml-runtime
 #
 Provides:       ocamlfind = %{version}
-
-BuildRequires:  m4
-BuildRequires:  ncurses-devel
 BuildRequires:  ocaml
 BuildRequires:  ocaml-ocamldoc
-BuildRequires:  ocaml-rpm-macros >= 20200220
+BuildRequires:  ocaml-rpm-macros >= 20210409
 
 %description
 Findlib is a library manager for Objective Caml. It provides a
@@ -58,7 +55,7 @@ The ocaml-findlib-devel package contains libraries and signature files
 for developing applications that use ocaml-findlib.
 
 %prep
-%autosetup -p1 -n findlib-%{version}
+%setup -q -n findlib-%{version}
 
 %build
 rm -rfv site-lib-src
@@ -70,17 +67,16 @@ tools/extract_args/extract_args -o src/findlib/ocaml_args.ml ocamlc ocamlcp ocam
   -mandir %{_mandir} \
   -with-toolbox
 make all
-%if 0%{?ocaml_native_compiler}
 make opt
-%endif
-rm -fv doc/guide-html/TIMESTAMP
 
 %install
 make install prefix=%{buildroot}
 rm -rfv %{buildroot}%{ocaml_standard_library}/ocamlbuild
+rm -rfv %{buildroot}%{ocaml_standard_library}/findlib/Makefile.packages
 %ocaml_create_file_list
 
 %files -f %{name}.files
+%defattr(-,root,root,-)
 %{ocaml_standard_library}/ocamlfind.conf
 %{ocaml_standard_library}/topfind
 %{_bindir}/*
@@ -88,6 +84,7 @@ rm -rfv %{buildroot}%{ocaml_standard_library}/ocamlbuild
 #
 
 %files devel -f %{name}.files.devel
+%defattr(-,root,root,-)
 %{ocaml_standard_library}/*/Makefile.config
 
 %changelog