diff --git a/ocaml-bin-prot.spec b/ocaml-bin-prot.spec index 842e64c..bc192e1 100644 --- a/ocaml-bin-prot.spec +++ b/ocaml-bin-prot.spec @@ -4,7 +4,7 @@ Name: ocaml-bin-prot Version: 2.0.9 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Read and write OCaml values in a type-safe binary protocol License: LGPLv2+ with exceptions @@ -12,7 +12,7 @@ URL: http://forge.ocamlcore.org/projects/bin-prot Source0: http://forge.ocamlcore.org/frs/download.php/%{dlnode}/bin_prot-%{version}.tar.gz # Remove -Werror from flags. -Patch1: ocaml-bin-prot-2.0.9-remove-Werror.patch +Patch1: %{name}-2.0.9-remove-Werror.patch BuildRequires: ocaml >= 3.12.0 BuildRequires: ocaml-findlib-devel @@ -51,6 +51,14 @@ developing applications that use %{name}. %setup -q -n bin_prot-%{version} %patch1 -p1 +# Use Fedora CFLAGS, and define ARCH_INT64_TYPE +expr=' "-DARCH_INT64_TYPE";' +for flag in %{optflags}; do + expr+="\\$\n"' '"\"$flag\";" +done +sed -i "/-pipe/,/-Wno-long-long/c\\$expr" myocamlbuild.ml +sed -i 's/;\$$/;/' myocamlbuild.ml + %build ocaml setup.ml -configure --prefix %{_prefix} \ @@ -81,7 +89,7 @@ chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so %files -%doc COPYRIGHT LICENSE LICENSE.Tywith +%license COPYRIGHT LICENSE LICENSE.Tywith %{_libdir}/ocaml/bin_prot %if %opt %exclude %{_libdir}/ocaml/bin_prot/*.a @@ -102,6 +110,11 @@ chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so %changelog +* Thu Sep 25 2014 Jerry James - 2.0.9-10 +- Rebuild for dependencies +- Use native, rather than emulated endian-specific, 64-bit arithmetic +- Fix license handling + * Sun Aug 17 2014 Fedora Release Engineering - 2.0.9-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild