diff --git a/ocaml-fileutils.changes b/ocaml-fileutils.changes index 4f3a939..a78e411 100644 --- a/ocaml-fileutils.changes +++ b/ocaml-fileutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 30 06:39:17 UTC 2016 - ohering@suse.de + +- Fix build with ocaml-4.03 (fate#320836) + ------------------------------------------------------------------- Tue Nov 10 10:18:47 UTC 2015 - ohering@suse.de diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 8bf712d..610dcfe 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -18,8 +18,8 @@ Name: ocaml-fileutils Version: 0.5.0 -%{ocaml_preserve_bytecode} Release: 0 +%{ocaml_preserve_bytecode} Summary: OCaml library for common file and filename operations License: SUSE-LGPL-2.0-with-linking-exception Group: Development/Libraries/Other @@ -27,9 +27,8 @@ Url: https://forge.ocamlcore.org/projects/ocaml-fileutils/ Source0: ocaml-fileutils-%{version}.tar.xz BuildRequires: ocaml >= 4.00.1 BuildRequires: ocaml-rpm-macros >= 4.02.1 -BuildRequires: ocamlfind(findlib) BuildRequires: ocamlfind(str) -BuildRequires: ocaml-ocamlbuild +BuildRequires: ocaml-oasis BuildRequires: ocaml-ocamldoc BuildRoot: %{_tmppath}/%{name}-%{version}-build # ocaml autodep start for pkg: ocaml-fileutils @@ -63,24 +62,31 @@ developing applications that use %{name}. %build -ocaml setup.ml -configure --prefix %{_prefix} --destdir %{buildroot} -make %{?_smp_mflags} +oasis setup +ocaml setup.ml -configure \ + --bindir '%{_bindir}' \ + --mandir '%{_mandir}' \ + --destdir '%{buildroot}' \ + --datarootdir '%{_datadir}' \ + --libdir '%{_libdir}' \ + --libexecdir '%{_libexecdir}' \ + --localstatedir '%{_localstatedir}' \ + --sbindir '%{_sbindir}' \ + --prefix '%{_prefix}' \ + --sysconfdir '%{_sysconfdir}' \ + --exec-prefix '%{_exec_prefix}' \ + --sharedstatedir '%{_sharedstatedir}' +ocaml setup.ml -build %install -export DESTDIR=%{buildroot} -export OCAMLFIND_DESTDIR=%{buildroot}%{_libdir}/ocaml -mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs - -# Set htmldir to current directory, then copy the docs (in api/) -# as a %doc rule. -make htmldir=. install +export OCAMLFIND_DESTDIR=%{buildroot}`ocamlc -where` +mkdir -p $OCAMLFIND_DESTDIR +ocaml setup.ml -install %check -make %{?_smp_mflags} test - - +ocaml setup.ml -test %files %defattr(-,root,root,-) @@ -101,8 +107,11 @@ make %{?_smp_mflags} test %{_libdir}/ocaml/*/*.cmx %{_libdir}/ocaml/*/*.cmxa %endif +%{_libdir}/ocaml/*/*.annot %{_libdir}/ocaml/*/*.cma %{_libdir}/ocaml/*/*.cmi +%{_libdir}/ocaml/*/*.cmt +%{_libdir}/ocaml/*/*.cmti %{_libdir}/ocaml/*/*.mli %{_libdir}/ocaml/*/*.ml %{_libdir}/ocaml/*/META