From ea8353cc252ed65cbb864fcd38c65d38cc223152 Mon Sep 17 00:00:00 2001 From: dj_palli Date: Thu, 19 Dec 2024 19:35:37 +0000 Subject: [PATCH 1/3] ocaml-calendar: update to 3.0.0 --- .../ocaml-calendar.signatures.json | 2 +- .../ocaml-calendar/ocaml-calendar.spec | 87 ++++++++++--------- cgmanifest.json | 4 +- 3 files changed, 49 insertions(+), 44 deletions(-) diff --git a/SPECS-EXTENDED/ocaml-calendar/ocaml-calendar.signatures.json b/SPECS-EXTENDED/ocaml-calendar/ocaml-calendar.signatures.json index a11a8e1b723..67a08a5516b 100644 --- a/SPECS-EXTENDED/ocaml-calendar/ocaml-calendar.signatures.json +++ b/SPECS-EXTENDED/ocaml-calendar/ocaml-calendar.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "calendar-2.04.tar.gz": "bea6faa0337a1c54b0f3c2b9b45c9eb90e2b2747406e6f0b841e1fd20fd4d9f7" + "calendar-3.0.0.tar.gz": "ea04d31762d3f18837af0311cdbfe7b7788aa0f2e7e9f98d2b0decec1e506e9e" } } diff --git a/SPECS-EXTENDED/ocaml-calendar/ocaml-calendar.spec b/SPECS-EXTENDED/ocaml-calendar/ocaml-calendar.spec index 861ec6ad0d9..ea250c2eadb 100644 --- a/SPECS-EXTENDED/ocaml-calendar/ocaml-calendar.spec +++ b/SPECS-EXTENDED/ocaml-calendar/ocaml-calendar.spec @@ -1,29 +1,40 @@ Vendor: Microsoft Corporation Distribution: Azure Linux + +# OCaml packages not built on i686 since OCaml 5 / Fedora 39. +ExcludeArch: %{ix86} + %ifnarch %{ocaml_native_compiler} %global debug_package %{nil} %endif +# ocaml-alcotest requires ocaml-astring, ocaml-cmdliner, ocaml-fmt, and ocaml-uutf, +# none of which are otherwise needed for building the OCaml-dependent packages +# found in RHEL and ELN. We want to avoid the extra dependencies there. +%bcond tests %[!0%{?rhel}] + +%global giturl https://github.com/ocaml-community/calendar + + Name: ocaml-calendar -Version: 2.04 -Release: 29%{?dist} +Epoch: 1 +Version: 3.0.0 +Release: 1%{?dist} Summary: Objective Caml library for managing dates and times -License: LGPLv2 - -URL: https://github.com/ocaml-community/calendar -Source0: https://download.ocamlcore.org/calendar/calendar/%{version}/calendar-%{version}.tar.gz +License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception -Patch1: calendar-2.03.2-enable-debug.patch +URL: https://ocaml-community.github.io/calendar/ +VCS: git:%{giturl}.git +Source0: %{giturl}/archive/v%{version}/calendar-%{version}.tar.gz +#Source1: https://github.com/ocaml-community/calendar/archive/refs/tags/v3.0.0.tar.gz#%{name}-v%{version}.tar.gz -BuildRequires: ocaml >= 4.00.1 -BuildRequires: ocaml-findlib-devel >= 1.3.3-3 -BuildRequires: ocaml-ocamldoc -BuildRequires: gawk +BuildRequires: ocaml >= 4.03 +BuildRequires: ocaml-dune >= 1.0 +BuildRequires: ocaml-re-devel >= 1.7.2 -# 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 +%if %{with tests} +BuildRequires: ocaml-alcotest-devel +%endif %description @@ -32,7 +43,7 @@ Objective Caml library for managing dates and times. %package devel Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description devel @@ -41,50 +52,44 @@ developing applications that use %{name}. %prep -%setup -q -n calendar-%{version} -%patch 1 -p1 +%autosetup -n calendar-%{version} -p1 %build -./configure --libdir=%{_libdir} -make -make doc - -mv TODO TODO.old -iconv -f iso-8859-1 -t utf-8 < TODO.old > TODO +%dune_build %install -export DESTDIR=$RPM_BUILD_ROOT -export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml -mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs -make install +%dune_install -%files -%doc CHANGES README TODO LGPL COPYING -%{_libdir}/ocaml/calendar -%ifarch %{ocaml_native_compiler} -%exclude %{_libdir}/ocaml/calendar/*.cmx +%if %{with tests} +%check +%dune_check %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 +%files -f .ofiles +%doc CHANGES README.md TODO +%license LGPL COPYING + + +%files devel -f .ofiles-devel +%doc CHANGES README.md TODO calendarFAQ-2.6.txt +%license LGPL COPYING %changelog +* Fri Dec 20 2024 Durga Jagadeesh Palli - 3.0.0-1 +- Update to 3.0.0 +- License verified + * Thu Oct 14 2021 Pawel Winogrodzki - 2.04-29 - Switching to using full number for the 'Release' tag. - Initial CBL-Mariner import from Fedora 32 (license: MIT). * Thu Feb 27 2020 Richard W.M. Jones - 2.04-28.1 -- OCaml 4.10.0 final (Fedora 32). +-- OCaml 4.10.0 final (Fedora 32). * Wed Feb 26 2020 Richard W.M. Jones - 2.04-28 - OCaml 4.10.0 final. diff --git a/cgmanifest.json b/cgmanifest.json index f34ce796876..10ce3b8ede9 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -14472,8 +14472,8 @@ "type": "other", "other": { "name": "ocaml-calendar", - "version": "2.04", - "downloadUrl": "https://download.ocamlcore.org/calendar/calendar/2.04/calendar-2.04.tar.gz" + "version": "3.0.0", + "downloadUrl": "https://github.com/ocaml-community/calendar/archive/refs/tags/v3.0.0.tar.gz" } } }, From cc6e20fe753c9d66f534a522ded30251aea39370 Mon Sep 17 00:00:00 2001 From: dj_palli Date: Mon, 6 Jan 2025 17:57:18 +0000 Subject: [PATCH 2/3] ocaml-calendar: remove the rhel unused macro --- .../ocaml-calendar/ocaml-calendar.spec | 106 ++++++++++++++++-- 1 file changed, 98 insertions(+), 8 deletions(-) diff --git a/SPECS-EXTENDED/ocaml-calendar/ocaml-calendar.spec b/SPECS-EXTENDED/ocaml-calendar/ocaml-calendar.spec index ea250c2eadb..4be273d91ad 100644 --- a/SPECS-EXTENDED/ocaml-calendar/ocaml-calendar.spec +++ b/SPECS-EXTENDED/ocaml-calendar/ocaml-calendar.spec @@ -11,7 +11,6 @@ ExcludeArch: %{ix86} # ocaml-alcotest requires ocaml-astring, ocaml-cmdliner, ocaml-fmt, and ocaml-uutf, # none of which are otherwise needed for building the OCaml-dependent packages # found in RHEL and ELN. We want to avoid the extra dependencies there. -%bcond tests %[!0%{?rhel}] %global giturl https://github.com/ocaml-community/calendar @@ -19,14 +18,13 @@ ExcludeArch: %{ix86} Name: ocaml-calendar Epoch: 1 Version: 3.0.0 -Release: 1%{?dist} +Release: 14%{?dist} Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception URL: https://ocaml-community.github.io/calendar/ VCS: git:%{giturl}.git Source0: %{giturl}/archive/v%{version}/calendar-%{version}.tar.gz -#Source1: https://github.com/ocaml-community/calendar/archive/refs/tags/v3.0.0.tar.gz#%{name}-v%{version}.tar.gz BuildRequires: ocaml >= 4.03 BuildRequires: ocaml-dune >= 1.0 @@ -80,13 +78,105 @@ developing applications that use %{name}. %changelog -* Fri Dec 20 2024 Durga Jagadeesh Palli - 3.0.0-1 -- Update to 3.0.0 +* Fri Dec 20 2024 Durga Jagadeesh Palli - 3.0.0-14 +- Initial Azure Linux import from Fedora 41 (license: MIT) - License verified -* Thu Oct 14 2021 Pawel Winogrodzki - 2.04-29 -- Switching to using full number for the 'Release' tag. -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Thu Jul 18 2024 Fedora Release Engineering - 1:3.0.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jun 19 2024 Richard W.M. Jones - 1:3.0.0-12 +- OCaml 5.2.0 ppc64le fix + +* Thu May 30 2024 Richard W.M. Jones - 3.0.0-11 +- OCaml 5.2.0 for Fedora 41 + +* Thu May 23 2024 Jerry James - 3.0.0-8 +- Simplify with %%bcond +- Add VCS field + +* Thu Jan 25 2024 Fedora Release Engineering - 3.0.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 3.0.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 18 2023 Richard W.M. Jones - 3.0.0-6 +- OCaml 5.1.1 + s390x code gen fix for Fedora 40 + +* Tue Dec 12 2023 Richard W.M. Jones - 3.0.0-5 +- OCaml 5.1.1 rebuild for Fedora 40 + +* Thu Oct 05 2023 Richard W.M. Jones - 3.0.0-4 +- OCaml 5.1 rebuild for Fedora 40 + +* Thu Jul 20 2023 Fedora Release Engineering - 3.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 Richard W.M. Jones - 3.0.0-2 +- OCaml 5.0 rebuild for Fedora 39 + + +* Mon Jul 10 2023 Jerry James - 3.0.0-1 +- Version 3.0.0 +- New project URLs +- Convert License tag to SPDX +- Drop obsolete debuginfo patch +- Build with dune + +* 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 * Thu Feb 27 2020 Richard W.M. Jones - 2.04-28.1 -- OCaml 4.10.0 final (Fedora 32). From adfe5256b5fc4d3dfe8e1c3fad082f0e9bc82b81 Mon Sep 17 00:00:00 2001 From: dj_palli Date: Fri, 10 Jan 2025 12:17:38 +0000 Subject: [PATCH 3/3] ocaml-calendar: remove the epoch --- .../ocaml-calendar/ocaml-calendar.signatures.json | 2 +- SPECS-EXTENDED/ocaml-calendar/ocaml-calendar.spec | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/SPECS-EXTENDED/ocaml-calendar/ocaml-calendar.signatures.json b/SPECS-EXTENDED/ocaml-calendar/ocaml-calendar.signatures.json index 67a08a5516b..b5b3f273f33 100644 --- a/SPECS-EXTENDED/ocaml-calendar/ocaml-calendar.signatures.json +++ b/SPECS-EXTENDED/ocaml-calendar/ocaml-calendar.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "calendar-3.0.0.tar.gz": "ea04d31762d3f18837af0311cdbfe7b7788aa0f2e7e9f98d2b0decec1e506e9e" + "ocaml-calendar-3.0.0.tar.gz": "ea04d31762d3f18837af0311cdbfe7b7788aa0f2e7e9f98d2b0decec1e506e9e" } } diff --git a/SPECS-EXTENDED/ocaml-calendar/ocaml-calendar.spec b/SPECS-EXTENDED/ocaml-calendar/ocaml-calendar.spec index 4be273d91ad..baa82eb8157 100644 --- a/SPECS-EXTENDED/ocaml-calendar/ocaml-calendar.spec +++ b/SPECS-EXTENDED/ocaml-calendar/ocaml-calendar.spec @@ -1,30 +1,23 @@ Vendor: Microsoft Corporation Distribution: Azure Linux -# OCaml packages not built on i686 since OCaml 5 / Fedora 39. -ExcludeArch: %{ix86} - %ifnarch %{ocaml_native_compiler} %global debug_package %{nil} %endif # ocaml-alcotest requires ocaml-astring, ocaml-cmdliner, ocaml-fmt, and ocaml-uutf, # none of which are otherwise needed for building the OCaml-dependent packages -# found in RHEL and ELN. We want to avoid the extra dependencies there. %global giturl https://github.com/ocaml-community/calendar - Name: ocaml-calendar -Epoch: 1 Version: 3.0.0 Release: 14%{?dist} Summary: Objective Caml library for managing dates and times License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception URL: https://ocaml-community.github.io/calendar/ -VCS: git:%{giturl}.git -Source0: %{giturl}/archive/v%{version}/calendar-%{version}.tar.gz +Source0: https://github.com/ocaml-community/calendar/archive/refs/tags/v3.0.0.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: ocaml >= 4.03 BuildRequires: ocaml-dune >= 1.0 @@ -41,7 +34,7 @@ Objective Caml library for managing dates and times. %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description devel