added option -no-camlp4 to fix META file conflict with camlp4 [release 1.8.0-2mamba;Sat Apr 27 2019]

ocaml-findlib.spec

@@ -2,7 +2,7 @@
 
 Name:          ocaml-findlib
 Version:       1.8.0
-Release:       1mamba
+Release:       2mamba
 Summary:       A library manager for OCaml
 Group:         Development/Tools
 Vendor:        openmamba
@@ -12,6 +12,7 @@ URL:           http://projects.camlcity.org/projects/findlib.html
 Source:        http://download.camlcity.org/download/findlib-%{version}.tar.gz
 License:       MIT
 ## AUTOBUILDREQ-BEGIN
+BuildRequires: glibc-devel
 ## AUTOBUILDREQ-END
 BuildRequires: ocaml >= 4.00.1
 BuildRequires: ocaml-labltk >= 4.00.1
@@ -53,7 +54,8 @@ This package contains libraries and header files for developing applications tha
    -mandir %{_mandir} \
    -sitelib `ocamlc -where` \
    -with-toolbox \
-   -config %{_sysconfdir}/ocaml/findlib.conf
+   -config %{_sysconfdir}/ocaml/findlib.conf \
+   -no-camlp4
 
 %make
 %make opt
@@ -69,26 +71,24 @@ mkdir -p %{buildroot}%{_sysconfdir}/prelink.conf.d
 echo "-b %{_bindir}/ocamlfind" \
   > %{buildroot}%{_sysconfdir}/prelink.conf.d/ocaml-ocamlfind.conf
 
+rm -f %{buildroot}%{_libdir}/ocaml/ocamlbuild/META
+
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
 %files
 %defattr(-,root,root)
 %attr(0555,root,root) %{_bindir}/ocamlfind
-%ifarch arm
-%attr(0555,root,root) %{_bindir}/safe_camlp4
-%endif
-%{_bindir}/safe_camlp4
 %{_libdir}/ocaml/*/META
 %dir %{_libdir}/ocaml/findlib
 %dir %{_libdir}/ocaml/topfind
 %{_libdir}/ocaml/findlib/*.cma
 %{_libdir}/ocaml/findlib/*.cmi
 %{_libdir}/ocaml/findlib/*.cmxs
-%{_libdir}/ocaml/bytes/*.cma
+#%{_libdir}/ocaml/bytes/*.cma
-%{_libdir}/ocaml/bytes/*.cmi
+#%{_libdir}/ocaml/bytes/*.cmi
-%{_libdir}/ocaml/bytes/*.cmx
+#%{_libdir}/ocaml/bytes/*.cmx
-%{_libdir}/ocaml/bytes/*.cmxs
+#%{_libdir}/ocaml/bytes/*.cmxs
 #%{_libdir}/ocaml/num-top/*.cma
 #%{_libdir}/ocaml/num-top/*.cmi
 %{_mandir}/man1/ocamlfind.*
@@ -104,14 +104,19 @@ echo "-b %{_bindir}/ocamlfind" \
 %{_libdir}/ocaml/findlib/*.a
 %{_libdir}/ocaml/findlib/*.cmxa
 %{_libdir}/ocaml/findlib/*.mli
-%{_libdir}/ocaml/bytes/*.a
+#%{_libdir}/ocaml/bytes/*.a
-%{_libdir}/ocaml/bytes/*.cmxa
+#%{_libdir}/ocaml/bytes/*.cmxa
 %{_libdir}/ocaml/findlib/Makefile.config
+%ifnarch x8_64
 %{_libdir}/ocaml/findlib/make_wizard
 %{_libdir}/ocaml/findlib/make_wizard.pattern
-%doc LICENSE doc/README doc/guide-html
+%endif
+#%doc LICENSE doc/README doc/guide-html
 
 %changelog
+* Sat Apr 27 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 1.8.0-2mamba
+- added option -no-camlp4 to fix  META file conflict with camlp4
+
 * Tue Jun 05 2018 Automatic Build System <autodist@mambasoft.it> 1.8.0-1mamba
 - automatic version update by autodist