commit 07becc540db9bc0c53fd7acec97f3b273f844213
Author: Richard W.M. Jones <rjones@xxxxxxxxxx>
Date: Thu Jan 6 09:50:37 2011 +0000
Add patch for compiling against camomile 0.8.
ocaml-gettext-0.3.3-with-camomile-0.8.patch | 12 ++++++++++++
ocaml-gettext.spec | 13 ++++++++++---
2 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/ocaml-gettext-0.3.3-with-camomile-0.8.patch b/ocaml-gettext-0.3.3-with-camomile-0.8.patch
new file mode 100644
index 0000000..0fd6cb5
--- /dev/null
+++ b/ocaml-gettext-0.3.3-with-camomile-0.8.patch
@@ -0,0 +1,12 @@
+--- ocaml-gettext-0.3.3.old/libgettext-camomile-ocaml/gettextCamomile.ml 2008-04-29 23:32:41.000000000 +0100
++++ ocaml-gettext-0.3.3/libgettext-camomile-ocaml/gettextCamomile.ml 2011-01-06 09:46:00.409235647 +0000
+@@ -21,8 +21,7 @@
+ (**************************************************************************)
+
+
+-open CamomileLibrary;;
+-open Default.Camomile;;
++open CamomileLibraryDefault.Camomile;;
+ open GettextTypes;;
+
+ (** Error reported when something goes wrong during Camomile initialization.
diff --git a/ocaml-gettext.spec b/ocaml-gettext.spec
index 4f91e95..6ab2920 100644
--- a/ocaml-gettext.spec
+++ b/ocaml-gettext.spec
@@ -3,7 +3,7 @@
Name: ocaml-gettext
Version: 0.3.3
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: OCaml library for i18n
Group: Development/Libraries
@@ -13,7 +13,10 @@ Source0: http://sylvain.le-gall.net/download/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: sparc64 s390 s390x
-BuildRequires: ocaml >= 3.11.0-1
+# Fix for camomile 0.8. Sent upstream on 2011-01-06.
+Patch0: ocaml-gettext-0.3.3-with-camomile-0.8.patch
+
+BuildRequires: ocaml >= 3.12.0-3
BuildRequires: ocaml-findlib-devel >= 1.2.1-3
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-camlp4-devel
@@ -29,7 +32,7 @@ BuildRequires: autoconf
# we can remove the ifarch ppc64 stuff in this file. In the meantime
# we have to build without camomile on ppc64.
%ifnarch ppc64
-BuildRequires: ocaml-camomile-devel >= 0.7.1
+BuildRequires: ocaml-camomile-devel >= 0.8.1
BuildRequires: ocaml-camomile-data
%endif
@@ -97,6 +100,7 @@ signature files for developing applications that use
%prep
%setup -q
+%patch0 -p1
%build
@@ -218,6 +222,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jan 6 2011 Richard W.M. Jones <rjones@xxxxxxxxxx> - 0.3.3-5
+- Add patch for compiling against camomile 0.8.
+
* Wed Jan 05 2011 Richard W.M. Jones <rjones@xxxxxxxxxx> - 0.3.3-4
- Rebuild for OCaml 3.12 (http://fedoraproject.org/wiki/Features/OCaml3.12).
_______________________________________________
ocaml-devel mailing list
ocaml-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/ocaml-devel
