From 5ee9cb1340927e14c6fc50941cab41f65faed2ff1d6835c79eecc22fc75f81d5 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 24 Feb 2020 17:31:09 +0000 Subject: [PATCH] - Require current ocaml-rpm-macros - Remove unused dependency to ocamlbuild in preparation of ocamlbuild removal OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=88 --- ocaml-findlib.changes | 6 ++++++ ocaml-findlib.spec | 15 +++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ocaml-findlib.changes b/ocaml-findlib.changes index 97519ec..d94f831 100644 --- a/ocaml-findlib.changes +++ b/ocaml-findlib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 20 20:20:20 UTC 2020 - ohering@suse.de + +- Require current ocaml-rpm-macros +- Remove unused dependency to ocamlbuild in preparation of ocamlbuild removal + ------------------------------------------------------------------- Fri Nov 1 12:34:56 UTC 2019 - ohering@suse.de diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index dcc60f0..4ef04f2 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -36,9 +36,8 @@ Provides: ocamlfind = %{version} BuildRequires: m4 BuildRequires: ncurses-devel BuildRequires: ocaml -BuildRequires: ocaml-ocamlbuild BuildRequires: ocaml-ocamldoc -BuildRequires: ocaml-rpm-macros >= 20191101 +BuildRequires: ocaml-rpm-macros >= 20200220 %description Findlib is a library manager for Objective Caml. It provides a @@ -65,9 +64,9 @@ for developing applications that use ocaml-findlib. rm -rfv site-lib-src (cd tools/extract_args && make) tools/extract_args/extract_args -o src/findlib/ocaml_args.ml ocamlc ocamlcp ocamlmktop ocamlopt ocamldep ocamldoc ||: -./configure -config %{_libdir}/ocaml/ocamlfind.conf \ +./configure -config %{ocaml_standard_library}/ocamlfind.conf \ -bindir %{_bindir} \ - -sitelib `ocamlc -where` \ + -sitelib '%{ocaml_standard_library}' \ -mandir %{_mandir} \ -with-toolbox make all @@ -78,17 +77,17 @@ rm -fv doc/guide-html/TIMESTAMP %install make install prefix=%{buildroot} -rm -rfv %{buildroot}%{_libdir}/ocaml/ocamlbuild +rm -rfv %{buildroot}%{ocaml_standard_library}/ocamlbuild %ocaml_create_file_list %files -f %{name}.files -%{_libdir}/ocaml/ocamlfind.conf -%{_libdir}/ocaml/topfind +%{ocaml_standard_library}/ocamlfind.conf +%{ocaml_standard_library}/topfind %{_bindir}/* %{_mandir}/man?/* # %files devel -f %{name}.files.devel -%{_libdir}/ocaml/*/Makefile.config +%{ocaml_standard_library}/*/Makefile.config %changelog