Compare commits
59 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
d49c0e2755 | ||
|
624a13a000 | ||
|
16eac3bbb7 | ||
|
e54a81b7e2 | ||
|
e23c59e037 | ||
|
6d039cdefd | ||
|
bcba3f3951 | ||
|
d8483a61f8 | ||
|
de72375f7e | ||
|
950a206072 | ||
|
b54d95adf9 | ||
|
0281607c1d | ||
|
607a899ae7 | ||
|
24c4292e54 | ||
|
3829babe93 | ||
|
29550b965a | ||
|
cf7d8b4a13 | ||
|
af8742a31b | ||
|
79bcc9d04e | ||
|
962a5958de | ||
|
58a9556bc8 | ||
|
2d78a6377c | ||
|
d4849ed476 | ||
|
f0194209bb | ||
|
559962bf44 | ||
|
068fd647f8 | ||
|
49ba3c9c38 | ||
|
96ae186127 | ||
|
3d8012c56e | ||
|
bc6be28a23 | ||
|
d18e23ff20 | ||
|
d5caeaead3 | ||
|
fef4d13e1c | ||
|
08d4b666aa | ||
|
e58832143e | ||
|
4fd729ff3b | ||
|
0ba67cbfb0 | ||
|
f5597b9478 | ||
|
486dbddc07 | ||
|
31fd559792 | ||
|
edd7fa9b45 | ||
|
3e24c67413 | ||
|
491a41fcf8 | ||
|
e2ce96e648 | ||
|
d57d933cdb | ||
|
cc2a392bd2 | ||
|
507840c3f3 | ||
|
451a987865 | ||
|
ff22067ca9 | ||
|
1f76f78956 | ||
|
9e7f251506 | ||
|
821fb48d5f | ||
|
29677452ac | ||
|
016c56bd06 | ||
|
10b3076033 | ||
|
5efc76c3b5 | ||
|
27b851ea51 | ||
|
ffe6f694a1 | ||
|
86042611b7 |
25
ocaml-facile-ocaml-4.patch
Normal file
25
ocaml-facile-ocaml-4.patch
Normal 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
|
@ -1,38 +1,29 @@
|
|||||||
%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
|
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
|
||||||
%define debug_package %{nil}
|
%global debug_package %{nil}
|
||||||
%define _default_patch_fuzz 2
|
%global _default_patch_fuzz 2
|
||||||
|
|
||||||
%if 0%{?fedora} < 9
|
|
||||||
# no ocaml (#438562)
|
|
||||||
ExcludeArch: ppc64
|
|
||||||
%endif
|
|
||||||
|
|
||||||
Name: ocaml-facile
|
Name: ocaml-facile
|
||||||
Version: 1.1
|
Version: 1.1
|
||||||
Release: 12%{?dist}
|
Release: 69%{?dist}
|
||||||
Summary: OCaml library for constraint programming
|
Summary: OCaml library for constraint programming
|
||||||
Summary(fr): Librairie OCaml de programmation par contraintes
|
Summary(fr): Librairie OCaml de programmation par contraintes
|
||||||
|
|
||||||
Group: Development/Libraries
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
|
|
||||||
URL: http://www.recherche.enac.fr/log/facile/
|
URL: http://www.recherche.enac.fr/log/facile/
|
||||||
Source0: http://www.recherche.enac.fr/log/facile/distrib/facile-1.1.tar.gz
|
Source0: http://www.recherche.enac.fr/log/facile/distrib/facile-1.1.tar.gz
|
||||||
|
|
||||||
# makefile fixes by Steffen Joeris <white@debian.org>:
|
# makefile fixes by Steffen Joeris <white@debian.org>:
|
||||||
# * only build and install native binaries if ocamlopt is available
|
# * only build and install native binaries if ocamlopt is available
|
||||||
# * install .mli files
|
# * install .mli files
|
||||||
Patch0: facile-1.1-makefile-fixes.patch
|
Patch0: facile-1.1-makefile-fixes.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
||||||
ExcludeArch: sparc64 s390 s390x
|
|
||||||
|
|
||||||
|
# Fix for OCaml 4.00.0.
|
||||||
|
Patch1: ocaml-facile-ocaml-4.patch
|
||||||
|
|
||||||
|
BuildRequires: make
|
||||||
BuildRequires: ocaml >= 3.02
|
BuildRequires: ocaml >= 3.02
|
||||||
BuildRequires: ocaml-findlib-devel
|
BuildRequires: ocaml-findlib-devel
|
||||||
|
|
||||||
%if 0%{?fedora} < 13
|
|
||||||
%define _use_internal_dependency_generator 0
|
|
||||||
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
|
|
||||||
%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
FaCiLe is a constraint programming library on integer and integer set finite
|
FaCiLe is a constraint programming library on integer and integer set finite
|
||||||
domains written in OCaml. It offers all usual facilities to create and
|
domains written in OCaml. It offers all usual facilities to create and
|
||||||
@ -71,7 +62,6 @@ l'aide du même langage puissant et efficace.
|
|||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Development files for %{name}
|
Summary: Development files for %{name}
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
@ -81,23 +71,23 @@ developing applications that use %{name}.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n facile-%{version}
|
%setup -q -n facile-%{version}
|
||||||
%patch0 -p1 -b .makefile-fixes
|
%patch0 -p1 -b .makefile-fixes
|
||||||
|
%patch1 -p1 -b .ocaml4
|
||||||
|
|
||||||
|
%build
|
||||||
# This is not autoconf, but a simple custom configure script.
|
# This is not autoconf, but a simple custom configure script.
|
||||||
# The --faciledir directory is only used for "make install".
|
# The --faciledir directory is only used for "make install".
|
||||||
./configure --faciledir $RPM_BUILD_ROOT%{_libdir}/ocaml/facile
|
./configure --faciledir $RPM_BUILD_ROOT%{_libdir}/ocaml/facile
|
||||||
|
%if %opt
|
||||||
%build
|
|
||||||
make
|
make
|
||||||
|
%else
|
||||||
|
make OCAMLC=ocamlc OCAMLMLI=ocamlc
|
||||||
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml
|
mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml
|
||||||
make install
|
make install
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc LICENSE README
|
%doc LICENSE README
|
||||||
%{_libdir}/ocaml/facile/
|
%{_libdir}/ocaml/facile/
|
||||||
%if %opt
|
%if %opt
|
||||||
@ -107,7 +97,6 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%exclude %{_libdir}/ocaml/facile/*.mli
|
%exclude %{_libdir}/ocaml/facile/*.mli
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%if %opt
|
%if %opt
|
||||||
%{_libdir}/ocaml/facile/*.a
|
%{_libdir}/ocaml/facile/*.a
|
||||||
%{_libdir}/ocaml/facile/*.cmxa
|
%{_libdir}/ocaml/facile/*.cmxa
|
||||||
@ -115,6 +104,179 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/ocaml/facile/*.mli
|
%{_libdir}/ocaml/facile/*.mli
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Mar 1 17:18:05 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 1.1-69
|
||||||
|
- OCaml 4.12.0 build
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-68
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.1-67
|
||||||
|
- OCaml 4.11.1 rebuild
|
||||||
|
|
||||||
|
* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.1-66
|
||||||
|
- OCaml 4.11.0 rebuild
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-65
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 1.1-64
|
||||||
|
- OCaml 4.11.0+dev2-2020-04-22 rebuild
|
||||||
|
|
||||||
|
* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.1-63
|
||||||
|
- OCaml 4.11.0 pre-release attempt 2
|
||||||
|
|
||||||
|
* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 1.1-62
|
||||||
|
- OCaml 4.11.0 pre-release
|
||||||
|
|
||||||
|
* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 1.1-61
|
||||||
|
- Update all OCaml dependencies for RPM 4.16.
|
||||||
|
|
||||||
|
* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.1-60
|
||||||
|
- OCaml 4.10.0 final.
|
||||||
|
|
||||||
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-59
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.1-58
|
||||||
|
- OCaml 4.10.0+beta1 rebuild.
|
||||||
|
|
||||||
|
* Thu Jan 09 2020 Richard W.M. Jones <rjones@redhat.com> - 1.1-57
|
||||||
|
- OCaml 4.09.0 for riscv64
|
||||||
|
|
||||||
|
* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 1.1-56
|
||||||
|
- OCaml 4.09.0 (final) rebuild.
|
||||||
|
|
||||||
|
* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 1.1-55
|
||||||
|
- OCaml 4.08.1 (final) rebuild.
|
||||||
|
|
||||||
|
* Wed Jul 31 2019 Richard W.M. Jones <rjones@redhat.com> - 1.1-54
|
||||||
|
- OCaml 4.08.1 (rc2) rebuild.
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-53
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jun 27 2019 Richard W.M. Jones <rjones@redhat.com> - 1.1-52
|
||||||
|
- OCaml 4.08.0 (final) rebuild.
|
||||||
|
|
||||||
|
* Tue Apr 30 2019 Richard W.M. Jones <rjones@redhat.com> - 1.1-51
|
||||||
|
- OCaml 4.08.0 (beta 3) rebuild.
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-50
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-49
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 1.1-48
|
||||||
|
- OCaml 4.07.0 (final) rebuild.
|
||||||
|
|
||||||
|
* Wed Jun 20 2018 Richard W.M. Jones <rjones@redhat.com> - 1.1-47
|
||||||
|
- OCaml 4.07.0-rc1 rebuild.
|
||||||
|
|
||||||
|
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-46
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Nov 18 2017 Richard W.M. Jones <rjones@redhat.com> - 1.1-45
|
||||||
|
- OCaml 4.06.0 rebuild.
|
||||||
|
|
||||||
|
* Tue Aug 08 2017 Richard W.M. Jones <rjones@redhat.com> - 1.1-44
|
||||||
|
- OCaml 4.05.0 rebuild.
|
||||||
|
|
||||||
|
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-43
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-42
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jun 27 2017 Richard W.M. Jones <rjones@redhat.com> - 1.1-41
|
||||||
|
- OCaml 4.04.2 rebuild.
|
||||||
|
|
||||||
|
* Sat May 13 2017 Richard W.M. Jones <rjones@redhat.com> - 1.1-40
|
||||||
|
- OCaml 4.04.1 rebuild.
|
||||||
|
|
||||||
|
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-39
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Nov 07 2016 Richard W.M. Jones <rjones@redhat.com> - 1.1-38
|
||||||
|
- Rebuild for OCaml 4.04.0.
|
||||||
|
|
||||||
|
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-37
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 1.1-36
|
||||||
|
- OCaml 4.02.3 rebuild.
|
||||||
|
|
||||||
|
* Tue Jul 21 2015 Richard W.M. Jones <rjones@redhat.com> - 1.1-35
|
||||||
|
- Enable bytecode compilation.
|
||||||
|
|
||||||
|
* Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 1.1-34
|
||||||
|
- ocaml-4.02.2 final rebuild.
|
||||||
|
|
||||||
|
* Thu Jun 18 2015 Richard W.M. Jones <rjones@redhat.com> - 1.1-33
|
||||||
|
- ocaml-4.02.2 rebuild.
|
||||||
|
|
||||||
|
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-32
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Feb 17 2015 Richard W.M. Jones <rjones@redhat.com> - 1.1-31
|
||||||
|
- ocaml-4.02.1 rebuild.
|
||||||
|
|
||||||
|
* Sun Aug 31 2014 Richard W.M. Jones <rjones@redhat.com> - 1.1-30
|
||||||
|
- ocaml-4.02.0 final rebuild.
|
||||||
|
|
||||||
|
* Sat Aug 23 2014 Richard W.M. Jones <rjones@redhat.com> - 1.1-29
|
||||||
|
- ocaml-4.02.0+rc1 rebuild.
|
||||||
|
|
||||||
|
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-28
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Aug 02 2014 Richard W.M. Jones <rjones@redhat.com> - 1.1-27
|
||||||
|
- ocaml-4.02.0-0.8.git10e45753.fc22 rebuild.
|
||||||
|
|
||||||
|
* Mon Jul 21 2014 Richard W.M. Jones <rjones@redhat.com> - 1.1-26
|
||||||
|
- OCaml 4.02.0 beta rebuild.
|
||||||
|
|
||||||
|
* Mon Jul 21 2014 Rex Dieter <rdieter@fedoraproject.org> 1.1-25
|
||||||
|
- rebuild (ocaml 4.02.0, #1121640)
|
||||||
|
|
||||||
|
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-24
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Apr 15 2014 Richard W.M. Jones <rjones@redhat.com> - 1.1-23
|
||||||
|
- Remove ocaml_arches macro (RHBZ#1087794).
|
||||||
|
|
||||||
|
* Sat Sep 14 2013 Richard W.M. Jones <rjones@redhat.com> - 1.1-22
|
||||||
|
- Rebuild for OCaml 4.01.0.
|
||||||
|
- Modernize the spec file.
|
||||||
|
|
||||||
|
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-21
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-20
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Oct 28 2012 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1.1-19
|
||||||
|
- Rebuild for OCaml 4.00.1.
|
||||||
|
|
||||||
|
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-18
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||||
|
|
||||||
|
* 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
|
||||||
|
- Drop obsolete conditionals
|
||||||
|
- Use ocaml_arches macro instead of hardcoded ExcludeArch
|
||||||
|
|
||||||
|
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-14
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jan 05 2011 Richard W.M. Jones <rjones@redhat.com> - 1.1-13
|
||||||
|
- Rebuild for OCaml 3.12 (http://fedoraproject.org/wiki/Features/OCaml3.12).
|
||||||
|
|
||||||
* Wed Dec 30 2009 Richard W.M. Jones <rjones@redhat.com> - 1.1-12
|
* Wed Dec 30 2009 Richard W.M. Jones <rjones@redhat.com> - 1.1-12
|
||||||
- Rebuild for OCaml 3.11.2.
|
- Rebuild for OCaml 3.11.2.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user