[ocaml-camomile/f17] - Remove patch which worked around segfault on ARM. Now fixed in OCaml >= 3.12.1-9. (cherry picke
Richard W.M. Jones
rjones at fedoraproject.org
Mon Jun 4 08:59:13 UTC 2012
commit 8b57934ea9fc48b4548074bf8313cb97647e7822
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Sun Jun 3 22:32:38 2012 +0100
- Remove patch which worked around segfault on ARM. Now fixed
in OCaml >= 3.12.1-9.
(cherry picked from commit db39bf22b0e71a9c308941855587b49616a74464)
camomile-new-arm-segfault-workaround.patch | 12 ------------
ocaml-camomile.spec | 17 +++++++++--------
2 files changed, 9 insertions(+), 20 deletions(-)
---
diff --git a/ocaml-camomile.spec b/ocaml-camomile.spec
index 64383ab..7127420 100644
--- a/ocaml-camomile.spec
+++ b/ocaml-camomile.spec
@@ -3,7 +3,7 @@
Name: ocaml-camomile
Version: 0.8.3
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Unicode library for OCaml
Group: Development/Libraries
@@ -16,11 +16,10 @@ Source0: http://downloads.sourceforge.net/camomile/camomile-%{version}.ta
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: sparc64 s390 s390x
-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
+BuildRequires: ocaml >= 3.12.1-9
+BuildRequires: ocaml-findlib-devel
+BuildRequires: ocaml-ocamldoc
+BuildRequires: ocaml-camlp4-devel
%define _use_internal_dependency_generator 0
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
@@ -58,8 +57,6 @@ applications that use %{name}.
%prep
%setup -q -n camomile-%{version}
-%patch1 -p1
-
# This is a horrible hack to work around a bug in our ppc64 code
# generator. For some reason which we don't fully understand it barfs
# on the long entry function created by the series of alias commands
@@ -150,6 +147,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jun 3 2012 Richard W.M. Jones <rjones at redhat.com> - 0.8.3-5
+- Remove patch which worked around segfault on ARM. Now fixed
+ in OCaml >= 3.12.1-9.
+
* Wed May 30 2012 Richard W.M. Jones <rjones at redhat.com> - 0.8.3-4
- Remove ExcludeArch ppc64.
- Add sed hack to reduce size of long entry function which breaks
More information about the scm-commits
mailing list