rpms
/
ocaml-calendar
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: rpms:cs10
Branches Tags
rpms:i10cs
rpms:cs10
rpms:i9c
rpms:c9
..
compare: rpms:c9
Branches Tags
rpms:i10cs
rpms:cs10
rpms:i9c
rpms:c9

No commits in common. 'cs10' and 'c9' have entirely different histories.
cs10 ... c9

2 changed files with 19 additions and 123 deletions
Show Stats

71
SOURCES/calendar-2.04-support-ocaml5.patch
Unescape View File

@ -1,71 +0,0 @@
--- calendar-2.04/configure.in~ 2014-10-29 10:03:20.000000000 +0000
+++ calendar-2.04/configure.in 2024-05-31 17:39:52.981965618 +0100
@@ -56,6 +56,7 @@
3.0*) echo "${ECHO_T}Unsupported version!"; exit 2;;
3.*) OCAMLMAJOR=3; echo "${ECHO_T}Good!";;
4.*) OCAMLMAJOR=4; echo "${ECHO_T}Good!";;
+ 5.*) OCAMLMAJOR=5; echo "${ECHO_T}Good!";;
*) echo "${ECHO_T}Unsupported version!"; exit 2;;
esac
diff -ur calendar-2.04.old/src/date.ml calendar-2.04/src/date.ml
--- calendar-2.04.old/src/date.ml 2014-10-29 10:03:20.000000000 +0000
+++ calendar-2.04/src/date.ml 2024-05-31 18:02:28.444110805 +0100
@@ -70,7 +70,7 @@
(* Constructors. *)
let lt (d1 : int * int * int) (d2 : int * int * int) =
- Pervasives.compare d1 d2 < 0
+ Stdlib.compare d1 d2 < 0
(* [date_ok] returns [true] is the date belongs to the Julian period;
[false] otherwise. *)
@@ -249,10 +249,10 @@
let sub x y = { m = x.m - y.m; d = x.d - y.d }
let opp x = { m = - x.m; d = - x.d }
- (* exactly equivalent to [Pervasives.compare] but more flexible typing *)
+ (* exactly equivalent to [Stdlib.compare] but more flexible typing *)
let compare x y =
- let n = Pervasives.compare x.m y.m in
- if n = 0 then Pervasives.compare x.d y.d else n
+ let n = Stdlib.compare x.m y.m in
+ if n = 0 then Stdlib.compare x.d y.d else n
let equal x y = compare x y = 0
let hash = Hashtbl.hash
diff -ur calendar-2.04.old/src/printer.ml calendar-2.04/src/printer.ml
--- calendar-2.04.old/src/printer.ml 2014-10-29 10:03:20.000000000 +0000
+++ calendar-2.04/src/printer.ml 2024-05-31 18:03:14.806779295 +0100
@@ -181,7 +181,7 @@
let print_int pad k n = print_number fmt pad k (Lazy.force n) in
let print_string pad s =
let pad s = match pad with
- | Uppercase -> String.uppercase s
+ | Uppercase -> String.uppercase_ascii s
| Empty | Zero | Blank -> s
in
Format.pp_print_string fmt (pad (Lazy.force s))
@@ -236,7 +236,7 @@
| 'n' -> print_char '\n'
| 'p' -> print_string pad apm
| 'P' ->
- Format.pp_print_string fmt (String.lowercase (Lazy.force apm))
+ Format.pp_print_string fmt (String.lowercase_ascii (Lazy.force apm))
| 'r' ->
print_time pad shour;
print_char ' ';
diff -ur calendar-2.04.old/src/utils.ml calendar-2.04/src/utils.ml
--- calendar-2.04.old/src/utils.ml 2014-10-29 10:03:20.000000000 +0000
+++ calendar-2.04/src/utils.ml 2024-05-31 18:02:28.445110798 +0100
@@ -29,8 +29,8 @@
module Int = struct
type t = int
- let equal = Pervasives.(=)
- let compare = Pervasives.compare
+ let equal = Stdlib.(=)
+ let compare = Stdlib.compare
let hash = Hashtbl.hash
end

69
SPECS/ocaml-calendar.spec
Unescape View File

@ -1,28 +1,23 @@
# OCaml packages not built on i686 since OCaml 5 / Fedora 39. %ifnarch %{ocaml_native_compiler}
ExcludeArch: %{ix86}
%undefine _package_note_flags
%global debug_package %{nil} %global debug_package %{nil}
%endif
Name: ocaml-calendar Name: ocaml-calendar
Epoch: 1
Version: 2.04 Version: 2.04
Release: 50%{?dist} Release: 40%{?dist}
Summary: Objective Caml library for managing dates and times Summary: Objective Caml library for managing dates and times
License: LGPLv2 License: LGPLv2
URL: http://calendar.forge.ocamlcore.org/ URL: http://calendar.forge.ocamlcore.org/
Source0: https://forge.ocamlcore.org/frs/download.php/1481/calendar-2.04.tar.gz Source0: https://forge.ocamlcore.org/frs/download.php/1481/calendar-2.04.tar.gz
Patch: calendar-2.03.2-enable-debug.patch Patch1: calendar-2.03.2-enable-debug.patch
Patch: calendar-2.04-support-ocaml5.patch
BuildRequires: make BuildRequires: make
BuildRequires: ocaml >= 4.00.1 BuildRequires: ocaml >= 4.00.1
BuildRequires: ocaml-findlib-devel >= 1.3.3-3 BuildRequires: ocaml-findlib-devel >= 1.3.3-3
BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-ocamldoc
BuildRequires: gawk BuildRequires: gawk
BuildRequires: autoconf
# Ignore all generated modules *except* CalendarLib, since everything # Ignore all generated modules *except* CalendarLib, since everything
# now appears in that namespace. # now appears in that namespace.
@ -36,7 +31,7 @@ Objective Caml library for managing dates and times.
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{version}-%{release}
%description devel %description devel
@ -45,11 +40,11 @@ developing applications that use %{name}.
%prep %prep
%autosetup -n calendar-%{version} -p1 %setup -q -n calendar-%{version}
%patch1 -p1
%build %build
autoconf
./configure --libdir=%{_libdir} ./configure --libdir=%{_libdir}
make make
make doc make doc
@ -83,48 +78,20 @@ make install
%changelog %changelog
* Thu Oct 31 2024 Troy Dawson <tdawson@redhat.com> - 1:2.04-50 * Fri Mar 11 2022 Richard W.M. Jones <rjones@redhat.com> - 2.04-40
- Bump release for October 2024 mass rebuild: - Rebuild for EPEL
Resolves: RHEL-64018 resolves: rhbz#2060850
* Tue Jun 25 2024 Troy Dawson <tdawson@redhat.com> - 1:2.04-49
- Bump release for June 2024 mass rebuild
* Wed Jun 19 2024 Richard W.M. Jones <rjones@redhat.com> - 2.04-48
- OCaml 5.2.0 ppc64le fix
* Fri May 31 2024 Richard W.M. Jones <rjones@redhat.com> - 2.04-47
- Revert back to ocaml-calendar 2.04 for RHEL 10
* Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 2.04-46
- Rebuild OCaml packages for F38
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.04-45
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.04-44
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jun 18 2022 Richard W.M. Jones <rjones@redhat.com> - 2.04-43
- OCaml 4.14.0 rebuild
* Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 2.04-42
- Bump release and rebuild.
* Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 2.04-41
- OCaml 4.13.1 rebuild to remove package notes
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.04-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 2.04-39 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.04-39
- OCaml 4.13.1 build - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.04-38 * Wed Jun 23 2021 Richard W.M. Jones <rjones@redhat.com> - 2.04-38
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - Bump and rebuild
resolves: rhbz#1975298
* Mon Mar 1 14:31:55 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 2.04-37 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.04-37
- OCaml 4.12.0 build - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.04-36 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.04-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Write Preview
Loading…
Cancel
Save