rpms/ocaml-gettext
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Add patch for compiling against camomile 0.8.

Browse Source
This commit is contained in:
Richard W.M. Jones 2011-01-06 09:50:37 +00:00
parent 463cb61ec7
commit 07becc540d
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ocaml-gettext-0.3.3-with-camomile-0.8.patch Normal file
View File

@ -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.

13
ocaml-gettext.spec
View File

@ -3,7 +3,7 @@
Name: ocaml-gettext Name: ocaml-gettext
Version: 0.3.3 Version: 0.3.3
Release: 4%{?dist} Release: 5%{?dist}
Summary: OCaml library for i18n Summary: OCaml library for i18n
Group: Development/Libraries 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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: sparc64 s390 s390x 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-findlib-devel >= 1.2.1-3
BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-camlp4-devel BuildRequires: ocaml-camlp4-devel
@ -29,7 +32,7 @@ BuildRequires: autoconf
# we can remove the ifarch ppc64 stuff in this file. In the meantime # we can remove the ifarch ppc64 stuff in this file. In the meantime
# we have to build without camomile on ppc64. # we have to build without camomile on ppc64.
%ifnarch ppc64 %ifnarch ppc64
BuildRequires: ocaml-camomile-devel >= 0.7.1 BuildRequires: ocaml-camomile-devel >= 0.8.1
BuildRequires: ocaml-camomile-data BuildRequires: ocaml-camomile-data
%endif %endif
@ -97,6 +100,7 @@ signature files for developing applications that use
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
@ -218,6 +222,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Thu Jan 6 2011 Richard W.M. Jones <rjones@redhat.com> - 0.3.3-5
- Add patch for compiling against camomile 0.8.
* Wed Jan 05 2011 Richard W.M. Jones <rjones@redhat.com> - 0.3.3-4 * Wed Jan 05 2011 Richard W.M. Jones <rjones@redhat.com> - 0.3.3-4
- Rebuild for OCaml 3.12 (http://fedoraproject.org/wiki/Features/OCaml3.12). - Rebuild for OCaml 3.12 (http://fedoraproject.org/wiki/Features/OCaml3.12).