[ocaml-camomile] Rebuild for OCaml 4.01.0.
Richard W.M. Jones
rjones at fedoraproject.org
Sat Sep 14 06:45:21 UTC 2013
commit d03a90d7e0f740cc06f35f0594c97b25d3d5b4b8
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Sat Sep 14 07:37:41 2013 +0100
Rebuild for OCaml 4.01.0.
- Enable debuginfo.
- Prevent parallel builds.
camomile-0.8.3-enable-debug.patch | 11 +++++++++++
ocaml-camomile.spec | 17 ++++++++++++++---
2 files changed, 25 insertions(+), 3 deletions(-)
---
diff --git a/camomile-0.8.3-enable-debug.patch b/camomile-0.8.3-enable-debug.patch
new file mode 100644
index 0000000..007c83d
--- /dev/null
+++ b/camomile-0.8.3-enable-debug.patch
@@ -0,0 +1,11 @@
+--- camomile-0.8.3/Makefile.in.old 2013-09-14 07:39:54.498539889 +0100
++++ camomile-0.8.3/Makefile.in 2013-09-14 07:40:02.920552224 +0100
+@@ -65,7 +65,7 @@
+ SUBDIR = -I internal -I public -I toolslib -I .
+ INCLUDES = $(SUBDIR)
+ BFLAGS = $(BOPTIONS) $(INCLUDES)
+-OFLAGS = $(OOPTIONS) $(INCLUDES)
++OFLAGS = $(OOPTIONS) $(INCLUDES) -g
+
+ # Generic targets
+ #################
diff --git a/ocaml-camomile.spec b/ocaml-camomile.spec
index 6233d8f..f05df3f 100644
--- a/ocaml-camomile.spec
+++ b/ocaml-camomile.spec
@@ -1,9 +1,8 @@
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%global debug_package %{nil}
Name: ocaml-camomile
Version: 0.8.3
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Unicode library for OCaml
# Several files are MIT and UCD licensed, but the overall work is LGPLv2+
@@ -12,6 +11,10 @@ Summary: Unicode library for OCaml
License: LGPLv2+
URL: http://sourceforge.net/projects/camomile/
Source0: http://downloads.sourceforge.net/camomile/camomile-%{version}.tar.bz2
+
+# Use ocamlopt -g option to enable debuginfo.
+Patch1: camomile-0.8.3-enable-debug.patch
+
ExcludeArch: sparc64 s390 s390x
BuildRequires: ocaml >= 3.12.1-12
@@ -50,13 +53,16 @@ applications that use %{name}.
%prep
%setup -q -n camomile-%{version}
+%patch1 -p1
+
%build
+# Parallel builds don't work.
+unset MAKEFLAGS
./configure --prefix=%{_prefix} --datadir=%{_datadir} --libdir=%{_libdir}
make
make dochtml
make man
-strip tools/*.opt
%install
@@ -105,6 +111,11 @@ cp tools/camomilelocaledef.opt $RPM_BUILD_ROOT%{_bindir}/camomilelocaledef
%changelog
+* Sat Sep 14 2013 Richard W.M. Jones <rjones at redhat.com> - 0.8.3-13
+- Rebuild for OCaml 4.01.0.
+- Enable debuginfo.
+- Prevent parallel builds.
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.3-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list