From 5ae061c86eca59a71a87386a9726fb97fd449675 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 20 Jul 2015 16:01:31 +0100 Subject: [PATCH] New upstream version 7.1.5. - Fix bytecode-only build. --- .gitignore | 1 + ocaml-pcre.spec | 18 +++++++----------- sources | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 528b7a5..8f52309 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ release-6.0.1.tar.bz2 /release-6.2.5.tar.bz2 /pcre-ocaml-7.0.2.tar.gz /pcre-ocaml-7.1.1.tar.gz +/pcre-ocaml-7.1.5.tar.gz diff --git a/ocaml-pcre.spec b/ocaml-pcre.spec index 080b1b5..14bd4bf 100644 --- a/ocaml-pcre.spec +++ b/ocaml-pcre.spec @@ -1,6 +1,6 @@ Name: ocaml-pcre -Version: 7.1.1 -Release: 8%{?dist} +Version: 7.1.5 +Release: 1%{?dist} Summary: Perl compatibility regular expressions (PCRE) for OCaml License: LGPLv2 @@ -40,22 +40,14 @@ developing applications that use %{name}. %build -%ifarch %{ocaml_native_compiler} make all -%else -make -C lib byte-code-library -%endif %install export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs -%ifarch %{ocaml_native_compiler} -make NATIVE=true install -%else -make LIBINSTALL_FILES="pcre.mli pcre.cmi pcre.cma libpcre_stubs.a dllpcre_stubs.so" install -%endif +make install # Installs API docs in %{_docdir}/api. Install this using %doc instead. mv $RPM_BUILD_ROOT%{_docdir}/api . @@ -83,6 +75,10 @@ mv $RPM_BUILD_ROOT%{_docdir}/api . %changelog +* Mon Jul 20 2015 Richard W.M. Jones - 7.1.5-1 +- New upstream version 7.1.5. +- Fix bytecode-only build. + * Wed Jun 24 2015 Richard W.M. Jones - 7.1.1-8 - Bump release and rebuild. diff --git a/sources b/sources index d60c15c..3a1e7bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7e5193553778803af71cc6a3cea242cc pcre-ocaml-7.1.1.tar.gz +28e40ad63fe2d568aa47ff460d3f9d3a pcre-ocaml-7.1.5.tar.gz