From a5dd16fae473e27708b404b1ed1375ed247a6758 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 22 Oct 2018 21:01:54 -0600 Subject: [PATCH] New upstream version. Ship libraries in the main package. --- ocaml-menhir.spec | 36 ++++++++++++++++++++++++++++++------ sources | 2 +- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/ocaml-menhir.spec b/ocaml-menhir.spec index c516dfa..8fc8192 100644 --- a/ocaml-menhir.spec +++ b/ocaml-menhir.spec @@ -6,7 +6,7 @@ %endif Name: ocaml-menhir -Version: 20180905 +Version: 20181006 Release: 1%{?dist} Summary: LR(1) parser generator for OCaml @@ -55,26 +55,50 @@ make -C demos clean make -C doc %install -# Remove executable bits from a demo file -chmod a-x demos/find-menhir.sh - +# Install export OCAMLFIND_DESTDIR=%{buildroot}%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR make install PREFIX=%{buildroot}%{_prefix} TARGET=%{target} rm -fr %{buildroot}%{_docdir}/menhir +# Remove executable bits from demo files +chmod a-x demos/find-menhir.sh \ + demos/generate-printers-dune/menhir-generate-printers + +# Remove demo files we do not want to ship +find demos -name _build -exec rm -fr {} \+ +find demos -name .merlin -exec rm {} \+ + %files %doc CHANGES.md README.md doc/manual.pdf demos %license LICENSE %{_bindir}/menhir %{_mandir}/man1/menhir.1* %{_datadir}/menhir/ +%dir %{_libdir}/ocaml/menhirLib/ +%{_libdir}/ocaml/menhirLib/META +%{_libdir}/ocaml/menhirLib/menhirLib.cmi +%{_libdir}/ocaml/menhirLib/menhirLib.cmo +%{_libdir}/ocaml/menhirLib/menhirLib.cmxs +%dir %{_libdir}/ocaml/menhirSdk/ +%{_libdir}/ocaml/menhirSdk/META +%{_libdir}/ocaml/menhirSdk/menhirSdk.cmi +%{_libdir}/ocaml/menhirSdk/menhirSdk.cmo +%{_libdir}/ocaml/menhirSdk/menhirSdk.cmxs %files devel -%{_libdir}/ocaml/menhirLib/ -%{_libdir}/ocaml/menhirSdk/ +%{_libdir}/ocaml/menhirLib/menhirLib.cmx +%{_libdir}/ocaml/menhirLib/menhirLib.ml +%{_libdir}/ocaml/menhirLib/menhirLib.mli +%{_libdir}/ocaml/menhirLib/menhirLib.o +%{_libdir}/ocaml/menhirSdk/menhirSdk.cmx +%{_libdir}/ocaml/menhirSdk/menhirSdk.o %changelog +* Mon Oct 22 2018 Jerry James - 20181006-1 +- New upstream version +- Ship libraries in the main package + * Thu Sep 27 2018 Jerry James - 20180905-1 - New upstream version diff --git a/sources b/sources index 5f32df6..8816ce1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (menhir-20180905.tar.gz) = b0d32da97a31376c8d55837c7fc1e7194c801cad454308ff933fa1def765b9aebaded62444c694c205c1fd6a2142f192bfe84366a5965fffb777e7f89dec004c +SHA512 (menhir-20181006.tar.gz) = a838c0b6411345ae64e21f8649367541a7e137af7e552e1dcc3da0c2212813de3d0c359dbd863d0130be897148063b406e0757fd2f18b42d43d3964963ebd4c7