New upstream version 1.2.0.

OCaml 4.06.0 rebuild.
Fix URL and source.
Stop using opt macro.
Enable debuginfo everywhere.
Try using parallel builds.
This commit is contained in:
Richard W.M. Jones 2017-11-17 14:46:15 +00:00
parent 94b3bda220
commit 732a287bde
3 changed files with 26 additions and 32 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/biniou-1.0.9.tar.gz
/ocaml-biniou-1.2.0.tar.gz

View File

@ -1,21 +1,17 @@
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%if !%{opt}
%global debug_package %{nil}
%endif
Name: ocaml-biniou
Version: 1.0.9
Release: 27%{?dist}
Version: 1.2.0
Release: 1%{?dist}
Summary: Safe and fast binary data format
License: BSD
URL: http://mjambon.com/biniou.html
Source0: http://mjambon.com/releases/biniou/biniou-%{version}.tar.gz
URL: https://github.com/mjambon/biniou
Source0: https://github.com/mjambon/biniou/archive/v%{version}/%{name}-%{version}.tar.gz
BuildRequires: ocaml >= 3.10.0
BuildRequires: ocaml-findlib
BuildRequires: ocaml-easy-format-devel
BuildRequires: ocaml-ocamldoc
BuildRequires: jbuilder
%global libname %(sed -e 's/^ocaml-//' <<< %{name})
@ -49,26 +45,18 @@ sed -i.add-debuginfo \
%build
# not thread safe - intermittent build failures as per 1.0.2
# see http://www.cmake.org/pipermail/cmake/2010-January/034746.html
# for similar problem
%global _smp_mflags %{nil}
make %{?_smp_mflags} all
%if %opt
make %{?_smp_mflags} opt
%endif
make %{?_smp_mflags} META
%install
# These rules work if the library uses 'ocamlfind install' to install itself.
export PREFIX=$RPM_BUILD_ROOT%{_prefix}
export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
mkdir -p $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $OCAMLFIND_DESTDIR
make install #DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml
%if %opt
cp -L _build/install/default/bin/* $RPM_BUILD_ROOT%{_bindir}
cp -rL _build/install/default/lib/* $RPM_BUILD_ROOT%{_libdir}/ocaml
%ifarch %{ocaml_native_compiler}
# avoid potential future name conflict
mv $RPM_BUILD_ROOT%{_bindir}/{,ocaml-}bdump
%endif
@ -77,38 +65,43 @@ mv $RPM_BUILD_ROOT%{_bindir}/{,ocaml-}bdump
%check
# The upstream Makefile doesn't know how to build the tests
# without ocamlopt, so:
%if %opt
%ifarch %{ocaml_native_compiler}
make test
%endif
%files
%doc LICENSE
%license LICENSE
%{_libdir}/ocaml/%{libname}/
%if %opt
%ifarch %{ocaml_native_compiler}
%exclude %{_libdir}/ocaml/*/*.a
%exclude %{_libdir}/ocaml/*/*.cmxa
%exclude %{_libdir}/ocaml/*/*.cmx
%exclude %{_libdir}/ocaml/*/*.o
%endif
%exclude %{_libdir}/ocaml/*/*.mli
%files devel
%doc LICENSE README.md Changes
%if %opt
%license LICENSE
%doc README.md Changes
%doc _build/install/default/doc/*
%ifarch %{ocaml_native_compiler}
%{_bindir}/ocaml-bdump
%{_libdir}/ocaml/*/*.a
%{_libdir}/ocaml/*/*.cmxa
%{_libdir}/ocaml/*/*.cmx
%{_libdir}/ocaml/*/*.o
%endif
%{_libdir}/ocaml/*/*.mli
%changelog
* Fri Nov 17 2017 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-27
* Fri Nov 17 2017 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-1
- New upstream version 1.2.0.
- OCaml 4.06.0 rebuild.
- Fix URL and source.
- Stop using opt macro.
- Enable debuginfo everywhere.
- Try using parallel builds.
* Tue Aug 08 2017 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-26
- OCaml 4.05.0 rebuild.

View File

@ -1 +1 @@
2f9f355281817912ac04c589eb463ef2 biniou-1.0.9.tar.gz
SHA512 (ocaml-biniou-1.2.0.tar.gz) = 04c04c2dd5e3e1237106db257567ba6900bd94759b07b02ba2e0d9209d1bbdc9ed629864e06d44a8b61f72d46fbcc7a0ffc86f82feb223d9d99ca41afc625fab