Bump release and rebuild for new OCaml on ARM.
- Include workaround for segfault in gen_mappings.ml on ARM.
(cherry picked from commit 0a30d4a35f
)
This commit is contained in:
parent
541a222eb8
commit
90e2e22e98
|
@ -0,0 +1,12 @@
|
||||||
|
--- camomile-0.8.3/mappings/gen_mappings.ml.old 2012-05-19 10:48:13.369690746 +0100
|
||||||
|
+++ camomile-0.8.3/mappings/gen_mappings.ml 2012-05-19 10:42:42.961692259 +0100
|
||||||
|
@@ -159,7 +159,8 @@
|
||||||
|
| _ -> ())
|
||||||
|
| TW ->
|
||||||
|
(match String.length enc with
|
||||||
|
- 1 -> () (*ascii*)
|
||||||
|
+ 1 ->
|
||||||
|
+ print_string ""; () (*ascii*)
|
||||||
|
| 2 -> (*CNS 11643 Plane 1*)
|
||||||
|
let enc1 = Char.code enc.[0] in
|
||||||
|
let enc2 = Char.code enc.[1] in
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
Name: ocaml-camomile
|
Name: ocaml-camomile
|
||||||
Version: 0.8.3
|
Version: 0.8.3
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Unicode library for OCaml
|
Summary: Unicode library for OCaml
|
||||||
|
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
|
@ -18,6 +18,10 @@ ExcludeArch: ppc64 sparc64 s390 s390x
|
||||||
|
|
||||||
BuildRequires: ocaml, ocaml-findlib-devel, ocaml-ocamldoc, ocaml-camlp4-devel
|
BuildRequires: ocaml, ocaml-findlib-devel, ocaml-ocamldoc, ocaml-camlp4-devel
|
||||||
|
|
||||||
|
# This works around a segfault when the gen_mappings.ml program is
|
||||||
|
# run after being compiled with the new ARM backend.
|
||||||
|
Patch1: camomile-new-arm-segfault-workaround.patch
|
||||||
|
|
||||||
%define _use_internal_dependency_generator 0
|
%define _use_internal_dependency_generator 0
|
||||||
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
|
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
|
||||||
%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
|
%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
|
||||||
|
@ -54,6 +58,8 @@ applications that use %{name}.
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n camomile-%{version}
|
%setup -q -n camomile-%{version}
|
||||||
|
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
./configure --prefix=%{_prefix} --datadir=%{_datadir} --libdir=%{_libdir}
|
./configure --prefix=%{_prefix} --datadir=%{_datadir} --libdir=%{_libdir}
|
||||||
|
@ -114,6 +120,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat May 19 2012 Richard W.M. Jones <rjones@redhat.com> - 0.8.3-2
|
||||||
|
- Include workaround for segfault in gen_mappings.ml on ARM.
|
||||||
|
- Bump release and rebuild for new OCaml on ARM.
|
||||||
|
|
||||||
* Fri Jan 6 2012 Richard W.M. Jones <rjones@redhat.com> - 0.8.3-1
|
* Fri Jan 6 2012 Richard W.M. Jones <rjones@redhat.com> - 0.8.3-1
|
||||||
- New upstream version 0.8.3.
|
- New upstream version 0.8.3.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue