Olaf Hering 2016-06-10 09:32:33 +00:00 committed by Git OBS Bridge
parent 9578927c7b
commit b692b460be
2 changed files with 10 additions and 7 deletions

View File

@ -1,7 +1,7 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 30 06:39:17 UTC 2016 - ohering@suse.de Mon May 30 06:39:17 UTC 2016 - ohering@suse.de
- Use ocamlfind() macro (fate#320836) - Use oasis (fate#320836)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 10 10:18:47 UTC 2015 - ohering@suse.de Tue Nov 10 10:18:47 UTC 2015 - ohering@suse.de

View File

@ -27,8 +27,7 @@ Url: http://ounit.forge.ocamlcore.org/
Source0: ounit-%{version}.tar.gz Source0: ounit-%{version}.tar.gz
Patch0: ounit-strict-formats.diff Patch0: ounit-strict-formats.diff
BuildRequires: ocaml BuildRequires: ocaml
BuildRequires: ocamlfind(findlib) BuildRequires: ocaml-oasis
BuildRequires: ocaml-ocamlbuild
BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-rpm-macros >= 4.02.1 BuildRequires: ocaml-rpm-macros >= 4.02.1
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -64,6 +63,7 @@ Development files needed for application based on %{name}.
%patch0 -p1 %patch0 -p1
%build %build
oasis setup
ocaml setup.ml -configure \ ocaml setup.ml -configure \
--bindir '%{_bindir}' \ --bindir '%{_bindir}' \
--mandir '%{_mandir}' \ --mandir '%{_mandir}' \
@ -78,12 +78,12 @@ ocaml setup.ml -configure \
--exec-prefix '%{_exec_prefix}' \ --exec-prefix '%{_exec_prefix}' \
--sharedstatedir '%{_sharedstatedir}' --sharedstatedir '%{_sharedstatedir}'
make %{?_smp_mflags} ocaml setup.ml -build
%install %install
export OCAMLFIND_DESTDIR=%{buildroot}%{_libdir}/ocaml export OCAMLFIND_DESTDIR=%{buildroot}`ocamlc -where`
test -d "$OCAMLFIND_DESTDIR" || mkdir -p "$OCAMLFIND_DESTDIR" mkdir -p $OCAMLFIND_DESTDIR
make install %{?_smp_mflags} ocaml setup.ml -install
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -103,8 +103,11 @@ make install %{?_smp_mflags}
%{_libdir}/ocaml/*/*.cmx %{_libdir}/ocaml/*/*.cmx
%{_libdir}/ocaml/*/*.cmxa %{_libdir}/ocaml/*/*.cmxa
%endif %endif
%{_libdir}/ocaml/*/*.annot
%{_libdir}/ocaml/*/*.cma %{_libdir}/ocaml/*/*.cma
%{_libdir}/ocaml/*/*.cmi %{_libdir}/ocaml/*/*.cmi
%{_libdir}/ocaml/*/*.cmt
%{_libdir}/ocaml/*/*.cmti
%{_libdir}/ocaml/*/*.ml %{_libdir}/ocaml/*/*.ml
%{_libdir}/ocaml/*/*.mli %{_libdir}/ocaml/*/*.mli
%{_libdir}/ocaml/*/META %{_libdir}/ocaml/*/META