rpms/ocaml-facile
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Add a patch for OCaml 4.00.0 (change in Hashtbl signature).

Browse Source 
- Move configure into build section.
This commit is contained in:
Richard W.M. Jones 2012-06-10 21:08:16 +01:00
parent 5efc76c3b5
commit 10b3076033
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ocaml-facile-ocaml-4.patch Normal file
View File

@ -0,0 +1,25 @@
diff -ur facile-1.1.old/src/facile.mli facile-1.1/src/facile.mli
--- facile-1.1.old/src/facile.mli 2004-09-08 10:51:02.000000000 +0100
+++ facile-1.1/src/facile.mli 2012-06-10 21:06:41.553916954 +0100
@@ -127,7 +127,7 @@
module Hashtbl :
sig
type ('a, 'b) t
- val create : int -> ('a, 'b) t
+ val create : ?random:bool -> int -> ('a, 'b) t
val get : ('a, 'b) t -> ('a, 'b) Hashtbl.t
val add : ('a, 'b) t -> 'a -> 'b -> unit
val find : ('a, 'b) t -> 'a -> 'b
Binary files facile-1.1.old/src/fcl_data.cmi and facile-1.1/src/fcl_data.cmi differ
diff -ur facile-1.1.old/src/fcl_data.mli facile-1.1/src/fcl_data.mli
--- facile-1.1.old/src/fcl_data.mli 2004-09-08 10:51:02.000000000 +0100
+++ facile-1.1/src/fcl_data.mli 2012-06-10 21:06:25.841590828 +0100
@@ -23,7 +23,7 @@
module Hashtbl : sig
type ('a, 'b) t
- val create : int -> ('a, 'b) t
+ val create : ?random:bool -> int -> ('a, 'b) t
val get : ('a, 'b) t -> ('a, 'b) Hashtbl.t
val add : ('a, 'b) t -> 'a -> 'b -> unit
val find : ('a, 'b) t -> 'a -> 'b

16
ocaml-facile.spec
View File

@ -4,7 +4,7 @@
Name: ocaml-facile
Version: 1.1
Release: 16%{?dist}
Release: 17%{?dist}
Summary: OCaml library for constraint programming
Summary(fr): Librairie OCaml de programmation par contraintes
@ -12,10 +12,15 @@ Group: Development/Libraries
License: LGPLv2+
URL: http://www.recherche.enac.fr/log/facile/
Source0: http://www.recherche.enac.fr/log/facile/distrib/facile-1.1.tar.gz
# makefile fixes by Steffen Joeris <white@debian.org>:
# * only build and install native binaries if ocamlopt is available
# * install .mli files
Patch0: facile-1.1-makefile-fixes.patch
# Fix for OCaml 4.00.0.
Patch1: ocaml-facile-ocaml-4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch: %{ocaml_arches}
@ -70,11 +75,12 @@ developing applications that use %{name}.
%prep
%setup -q -n facile-%{version}
%patch0 -p1 -b .makefile-fixes
%patch1 -p1 -b .ocaml4
%build
# This is not autoconf, but a simple custom configure script.
# The --faciledir directory is only used for "make install".
./configure --faciledir $RPM_BUILD_ROOT%{_libdir}/ocaml/facile
%build
make
%install
@ -104,8 +110,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/ocaml/facile/*.mli
%changelog
* Sun Jun 10 2012 Richard W.M. Jones <rjones@redhat.com> - 1.1-16
* Sun Jun 10 2012 Richard W.M. Jones <rjones@redhat.com> - 1.1-17
- Rebuild for OCaml 4.00.0.
- Add a patch for OCaml 4.00.0 (change in Hashtbl signature).
- Move configure into build section.
* Sat Jan 07 2012 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1.1-15
- Rebuild for OCaml 3.12.1