commit 6fe12217e22d132fe522d3c1a2184c6fece3d124 Author: MSVSphere Packaging Team Date: Fri Oct 25 17:21:35 2024 +0300 import ocaml-calendar-2.04-49.el10 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6f6f20f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/calendar-2.04.tar.gz diff --git a/.ocaml-calendar.metadata b/.ocaml-calendar.metadata new file mode 100644 index 0000000..5725549 --- /dev/null +++ b/.ocaml-calendar.metadata @@ -0,0 +1 @@ +20193984bd685170d546102dd57eb1fce34058d9 SOURCES/calendar-2.04.tar.gz diff --git a/SOURCES/calendar-2.03.2-enable-debug.patch b/SOURCES/calendar-2.03.2-enable-debug.patch new file mode 100644 index 0000000..6fc0d02 --- /dev/null +++ b/SOURCES/calendar-2.03.2-enable-debug.patch @@ -0,0 +1,11 @@ +--- calendar-2.03.2/Makefile.in.old 2013-09-14 16:15:43.760253519 +0100 ++++ calendar-2.03.2/Makefile.in 2013-09-14 16:16:03.233279962 +0100 +@@ -86,7 +86,7 @@ + + CAMLIBS = $(addprefix -I , $(DIRS)) + +-CAMLFLAGS= $(CAMLIBS) ++CAMLFLAGS= -g $(CAMLIBS) + BYTEFLAGS= $(CAMLFLAGS) + LINK_OPTFLAGS = $(CAMLFLAGS) -noassert + OPTFLAGS = $(LINK_OPTFLAGS) -for-pack CalendarLib diff --git a/SOURCES/calendar-2.04-support-ocaml5.patch b/SOURCES/calendar-2.04-support-ocaml5.patch new file mode 100644 index 0000000..100ce7a --- /dev/null +++ b/SOURCES/calendar-2.04-support-ocaml5.patch @@ -0,0 +1,71 @@ +--- 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 + diff --git a/SPECS/ocaml-calendar.spec b/SPECS/ocaml-calendar.spec new file mode 100644 index 0000000..200b956 --- /dev/null +++ b/SPECS/ocaml-calendar.spec @@ -0,0 +1,383 @@ +# OCaml packages not built on i686 since OCaml 5 / Fedora 39. +ExcludeArch: %{ix86} + +%undefine _package_note_flags +%global debug_package %{nil} + +Name: ocaml-calendar +Epoch: 1 +Version: 2.04 +Release: 49%{?dist} +Summary: Objective Caml library for managing dates and times +License: LGPLv2 + +URL: http://calendar.forge.ocamlcore.org/ +Source0: https://forge.ocamlcore.org/frs/download.php/1481/calendar-2.04.tar.gz + +Patch: calendar-2.03.2-enable-debug.patch +Patch: calendar-2.04-support-ocaml5.patch + +BuildRequires: make +BuildRequires: ocaml >= 4.00.1 +BuildRequires: ocaml-findlib-devel >= 1.3.3-3 +BuildRequires: ocaml-ocamldoc +BuildRequires: gawk +BuildRequires: autoconf + +# Ignore all generated modules *except* CalendarLib, since everything +# now appears in that namespace. +%global __ocaml_requires_opts -i Calendar_builder -i Calendar_sig -i Date -i Date_sig -i Fcalendar -i Ftime -i Period -i Printer -i Time -i Time_sig -i Time_Zone -i Utils -i Version +%global __ocaml_provides_opts -i Calendar_builder -i Calendar_sig -i Date -i Date_sig -i Fcalendar -i Ftime -i Period -i Printer -i Time -i Time_sig -i Time_Zone -i Utils -i Version + + +%description +Objective Caml library for managing dates and times. + + +%package devel +Summary: Development files for %{name} +Requires: %{name} = %{epoch}:%{version}-%{release} + + +%description devel +The %{name}-devel package contains libraries and signature files for +developing applications that use %{name}. + + +%prep +%autosetup -n calendar-%{version} -p1 + + +%build +autoconf +./configure --libdir=%{_libdir} +make +make doc + +mv TODO TODO.old +iconv -f iso-8859-1 -t utf-8 < TODO.old > TODO + + +%install +export DESTDIR=$RPM_BUILD_ROOT +export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml +mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs +make install + + +%files +%doc CHANGES README TODO LGPL COPYING +%{_libdir}/ocaml/calendar +%ifarch %{ocaml_native_compiler} +%exclude %{_libdir}/ocaml/calendar/*.cmx +%endif +%exclude %{_libdir}/ocaml/calendar/*.mli + + +%files devel +%doc CHANGES README TODO LGPL COPYING calendarFAQ-2.6.txt doc/* +%ifarch %{ocaml_native_compiler} +%{_libdir}/ocaml/calendar/*.cmx +%endif +%{_libdir}/ocaml/calendar/*.mli + + +%changelog +* Fri Oct 25 2024 MSVSphere Packaging Team - 1:2.04-49 +- Rebuilt for MSVSphere 10 + +* Tue Jun 25 2024 Troy Dawson - 1:2.04-49 +- Bump release for June 2024 mass rebuild + +* Wed Jun 19 2024 Richard W.M. Jones - 2.04-48 +- OCaml 5.2.0 ppc64le fix + +* Fri May 31 2024 Richard W.M. Jones - 2.04-47 +- Revert back to ocaml-calendar 2.04 for RHEL 10 + +* Tue Jan 24 2023 Richard W.M. Jones - 2.04-46 +- Rebuild OCaml packages for F38 + +* Thu Jan 19 2023 Fedora Release Engineering - 2.04-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 2.04-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jun 18 2022 Richard W.M. Jones - 2.04-43 +- OCaml 4.14.0 rebuild + +* Fri Feb 04 2022 Richard W.M. Jones - 2.04-42 +- Bump release and rebuild. + +* Fri Feb 04 2022 Richard W.M. Jones - 2.04-41 +- OCaml 4.13.1 rebuild to remove package notes + +* Thu Jan 20 2022 Fedora Release Engineering - 2.04-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Oct 04 2021 Richard W.M. Jones - 2.04-39 +- OCaml 4.13.1 build + +* Thu Jul 22 2021 Fedora Release Engineering - 2.04-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Mar 1 14:31:55 GMT 2021 Richard W.M. Jones - 2.04-37 +- OCaml 4.12.0 build + +* Tue Jan 26 2021 Fedora Release Engineering - 2.04-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Sep 01 2020 Richard W.M. Jones - 2.04-35 +- OCaml 4.11.1 rebuild + +* Fri Aug 21 2020 Richard W.M. Jones - 2.04-34 +- OCaml 4.11.0 rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 2.04-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon May 04 2020 Richard W.M. Jones - 2.04-32 +- OCaml 4.11.0+dev2-2020-04-22 rebuild + +* Tue Apr 21 2020 Richard W.M. Jones - 2.04-31 +- OCaml 4.11.0 pre-release attempt 2 + +* Fri Apr 17 2020 Richard W.M. Jones - 2.04-30 +- OCaml 4.11.0 pre-release + +* Thu Apr 02 2020 Richard W.M. Jones - 2.04-29 +- Update all OCaml dependencies for RPM 4.16. + +* Wed Feb 26 2020 Richard W.M. Jones - 2.04-28 +- OCaml 4.10.0 final. + +* Wed Jan 29 2020 Fedora Release Engineering - 2.04-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sun Jan 19 2020 Richard W.M. Jones - 2.04-26 +- OCaml 4.10.0+beta1 rebuild. + +* Thu Jan 09 2020 Richard W.M. Jones - 2.04-25 +- OCaml 4.09.0 for riscv64 + +* Fri Dec 06 2019 Richard W.M. Jones - 2.04-24 +- OCaml 4.09.0 (final) rebuild. + +* Fri Aug 16 2019 Richard W.M. Jones - 2.04-23 +- OCaml 4.08.1 (final) rebuild. + +* Wed Jul 31 2019 Richard W.M. Jones - 2.04-22 +- OCaml 4.08.1 (rc2) rebuild. + +* Thu Jul 25 2019 Fedora Release Engineering - 2.04-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jun 27 2019 Richard W.M. Jones - 2.04-20 +- OCaml 4.08.0 (final) rebuild. + +* Mon Apr 29 2019 Richard W.M. Jones - 2.04-19 +- OCaml 4.08.0 (beta 3) rebuild. + +* Fri Feb 01 2019 Fedora Release Engineering - 2.04-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 2.04-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Jul 11 2018 Richard W.M. Jones - 2.04-16 +- OCaml 4.07.0 (final) rebuild. + +* Tue Jun 19 2018 Richard W.M. Jones - 2.04-15 +- OCaml 4.07.0-rc1 rebuild. + +* Thu Feb 08 2018 Fedora Release Engineering - 2.04-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Nov 07 2017 Richard W.M. Jones - 2.04-13 +- OCaml 4.06.0 rebuild. + +* Mon Aug 07 2017 Richard W.M. Jones - 2.04-12 +- OCaml 4.05.0 rebuild. + +* Thu Aug 03 2017 Fedora Release Engineering - 2.04-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.04-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon Jun 26 2017 Richard W.M. Jones - 2.04-9 +- OCaml 4.04.2 rebuild. + +* Thu May 11 2017 Richard W.M. Jones - 2.04-8 +- Rebuild for OCaml 4.04.1. + +* Sat Feb 11 2017 Fedora Release Engineering - 2.04-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Nov 09 2016 Dan Horák - 2.04-6 +- rebuild for s390x codegen bug + +* Fri Nov 04 2016 Richard W.M. Jones - 2.04-5 +- Rebuild for OCaml 4.04.0. + +* Wed Oct 19 2016 Dan Horák - 2.04-4 +- disable debuginfo subpackage on interpreted builds + +* Thu Feb 04 2016 Fedora Release Engineering - 2.04-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jul 28 2015 Richard W.M. Jones - 2.04-2 +- OCaml 4.02.3 rebuild. + +* Tue Jul 21 2015 Richard W.M. Jones - 2.04-1 +- New upstream version 2.04. +- Enable bytecode compilation. + +* Wed Jun 24 2015 Richard W.M. Jones - 2.03.2-14 +- Bump release and rebuild. + +* Wed Jun 17 2015 Richard W.M. Jones - 2.03.2-13 +- ocaml-4.02.2 rebuild. + +* Mon Feb 16 2015 Richard W.M. Jones - 2.03.2-12 +- ocaml-4.02.1 rebuild. + +* Sat Aug 30 2014 Richard W.M. Jones - 2.03.2-11 +- ocaml-4.02.0 final rebuild. + +* Sat Aug 23 2014 Richard W.M. Jones - 2.03.2-10 +- Rebuild for ocaml-4.02.0+rc1. + +* Sun Aug 17 2014 Fedora Release Engineering - 2.03.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Aug 01 2014 Richard W.M. Jones - 2.03.2-8 +- ocaml-4.02.0-0.8.git10e45753.fc22 build. + +* Thu Jul 17 2014 Richard W.M. Jones - 2.03.2-7 +- Rebuild for OCaml 4.02.0 beta. + +* Sat Jun 07 2014 Fedora Release Engineering - 2.03.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Sep 14 2013 Richard W.M. Jones - 2.03.2-5 +- Rebuild for OCaml 4.01.0. +- Enable debuginfo. + +* Sat Aug 03 2013 Fedora Release Engineering - 2.03.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 2.03.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Nov 27 2012 Richard W.M. Jones - 2.03.2-2 +- BR >= OCaml 4.00.1 so we can't be built against the wrong OCaml. + +* Mon Oct 29 2012 Richard W.M. Jones - 2.03.2-1 +- New upstream version 2.03.2. +- Rebuild for OCaml 4.00.1. +- Remove upstream patch. + +* Fri Jul 20 2012 Fedora Release Engineering - 2.03.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jun 09 2012 Richard W.M. Jones - 2.03.1-4 +- Rebuild for OCaml 4.00.0. + +* Sat Apr 28 2012 Richard W.M. Jones - 2.03.1-2 +- Bump and rebuild against new OCaml compiler in ARM. + +* Fri Jan 6 2012 Richard W.M. Jones - 2.03.1-1 +- New upstream version 2.03.1. + +* Tue Feb 08 2011 Fedora Release Engineering - 2.03-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Jan 6 2011 Richard W.M. Jones - 2.03-1 +- New upstream version 2.03. +- Rebuild for OCaml 3.12.0. +- Remove META file patch, now upstream. + +* Tue Jan 12 2010 Richard W.M. Jones - 2.01.1-5 +- Replace %%define with %%global. +- Use upstream RPM 4.8 OCaml dependency generator. +- Suppress bogus requires as well as provides. + +* Wed Dec 30 2009 Richard W.M. Jones - 2.01.1-3 +- Rebuild for OCaml 3.11.2. + +* Thu Oct 8 2009 Richard W.M. Jones - 2.01.1-2 +- New upstream release 2.01.1. +- Patch META file so it doesn't include the library twice. + +* Sat Jul 25 2009 Fedora Release Engineering - 2.0.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sat May 23 2009 Richard W.M. Jones - 2.0.4-6 +- Calendar has a new upstream URL. + +* Sat May 23 2009 Richard W.M. Jones - 2.0.4-5 +- Rebuild for OCaml 3.11.1 + +* Thu Apr 16 2009 S390x secondary arch maintainer +- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs + (added sparc64 per request from the sparc maintainer) + +* Wed Feb 25 2009 Fedora Release Engineering - 2.0.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Nov 26 2008 Richard W.M. Jones - 2.0.4-3 +- Rebuild for OCaml 3.11.0+rc1. + +* Wed Nov 19 2008 Richard W.M. Jones - 2.0.4-2 +- Rebuild for OCaml 3.11.0 + +* Thu Jul 10 2008 Richard W.M. Jones - 2.0.4-1 +- New upstream version 2.0.4 (rhbz #454789). +- Fix non-UTF-8 characters in TODO. +- *.cmx file moved to -devel subpackage as per packaging guidelines. + +* Wed Apr 23 2008 Richard W.M. Jones - 2.0.2-2 +- Rebuild for OCaml 3.10.2 + +* Fri Mar 28 2008 Richard W.M. Jones - 2.0.2-1 +- New upstream version 2.0.2 (rhbz #439124) + +* Sat Mar 1 2008 Richard W.M. Jones - 2.0-2 +- Rebuild for ppc64. + +* Tue Feb 12 2008 Richard W.M. Jones - 2.0-1 +- New upstream version 2.0. +- Rebuild for OCaml 3.10.1. + +* Thu Sep 6 2007 Richard W.M. Jones - 1.10-9 +- Force rebuild because of updated requires/provides scripts in OCaml. + +* Mon Sep 3 2007 Richard W.M. Jones - 1.10-8 +- Force rebuild because of base OCaml. + +* Thu Aug 30 2007 Richard W.M. Jones - 1.10-7 +- Force rebuild because of changed BRs in base OCaml. + +* Tue Aug 7 2007 Richard W.M. Jones - 1.10-6 +- ExcludeArch ppc64 +- Clarify license is LGPLv2 +- Add LGPL, COPYING, calendarFAQ-2.6.txt and doc/ subdirectory to docs. +- BR +ocaml-ocamldoc + +* Mon Jun 11 2007 Richard W.M. Jones - 1.10-5 +- Updated to latest packaging guidelines. + +* Sat Jun 2 2007 Richard W.M. Jones - 1.10-4 +- Handle bytecode-only architectures. + +* Tue May 29 2007 Richard W.M. Jones - 1.10-3 +- Remove Debian DISTDIR patch. + +* Fri May 25 2007 Richard W.M. Jones - 1.10-2 +- Added find-requires and find-provides. + +* Fri May 18 2007 Richard W.M. Jones - 1.10-1 +- Initial RPM release. +