diff --git a/.gitignore b/.gitignore index 86ef105..5cdb851 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /*.src.rpm /results_utop /utop-*.tbz -/utop-*.tar.gz diff --git a/changelog b/changelog deleted file mode 100644 index 9c3b38f..0000000 --- a/changelog +++ /dev/null @@ -1,172 +0,0 @@ -* Tue Oct 08 2024 Richard W.M. Jones - 2.14.0-6 -- Rebuild for ocaml-lwt 5.8.0 - -* Fri Aug 9 2024 Jerry James - 2.14.0-5 -- Generate loaddefs instead of deprecated autoloads - -* Sat Jul 20 2024 Fedora Release Engineering - 2.14.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jun 19 2024 Richard W.M. Jones - 2.14.0-3 -- OCaml 5.2.0 ppc64le fix - -* Thu May 30 2024 Richard W.M. Jones - 2.14.0-2 -- OCaml 5.2.0 for Fedora 41 - -* Thu May 23 2024 Jerry James - 2.14.0-1 -- Version 2.14.0 - -* Sat Jan 27 2024 Fedora Release Engineering - 2.13.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Dec 18 2023 Richard W.M. Jones - 2.13.1-6 -- OCaml 5.1.1 + s390x code gen fix for Fedora 40 - -* Tue Dec 12 2023 Richard W.M. Jones - 2.13.1-5 -- OCaml 5.1.1 rebuild for Fedora 40 - -* Thu Oct 05 2023 Richard W.M. Jones - 2.13.1-4 -- OCaml 5.1 rebuild for Fedora 40 - -* Sat Jul 22 2023 Fedora Release Engineering - 2.13.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jul 12 2023 Richard W.M. Jones - 2.13.1-2 -- OCaml 5.0 rebuild for Fedora 39 - -* Mon Jul 10 2023 Jerry James - 2.13.1-1 -- Version 2.13.1 -- Add a %%check script - -* Tue Jan 24 2023 Richard W.M. Jones - 2.9.2-6 -- Rebuild OCaml packages for F38 - -* Sat Jan 21 2023 Fedora Release Engineering - 2.9.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Aug 18 2022 Jerry James - 2.9.2-4 -- Rebuild for ocaml-lwt 5.6.1 -- Convert License tag to SPDX - -* Sat Jul 23 2022 Fedora Release Engineering - 2.9.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jul 20 2022 Jerry James - 2.9.2-2 -- Use new OCaml macros - -* Sun Jun 19 2022 Richard W.M. Jones - 2.9.2-2 -- OCaml 4.14.0 rebuild - -* Thu Jun 16 2022 Jerry James - 2.9.2-1 -- Version 2.9.2 - -* Wed Apr 27 2022 Jerry James - 2.9.1-1 -- Version 2.9.1 - -* Fri Feb 04 2022 Richard W.M. Jones - 2.9.0-3 -- OCaml 4.13.1 rebuild to remove package notes - -* Sat Jan 22 2022 Fedora Release Engineering - 2.9.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Dec 10 2021 Jerry James - 2.9.0-1 -- Version 2.9.0 - -* Tue Oct 05 2021 Richard W.M. Jones - 2.8.0-3 -- OCaml 4.13.1 build - -* Fri Jul 23 2021 Fedora Release Engineering - 2.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 18 2021 Jerry James - 2.8.0-1 -- Version 2.8.0 -- New emacs-utop package to hold the Emacs interface - -* Thu Jun 3 2021 Richard W.M. Jones - 2.7.0-6 -- Rebuild for new ocaml-lwt. - -* Mon Mar 15 2021 Richard W.M. Jones - 2.7.0-5 -- Bump and rebuild for updated ocaml-findlib. - -* Mon Mar 1 19:52:15 GMT 2021 Richard W.M. Jones - 2.7.0-4 -- OCaml 4.12.0 build - -* Sat Feb 20 2021 Jerry James - 2.7.0-3 -- Rebuild for ocaml-lwt 5.4.0 - -* Wed Jan 27 2021 Fedora Release Engineering - 2.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jan 11 2021 Jerry James - 2.7.0-1 -- Version 2.7.0 - -* Wed Sep 02 2020 Richard W.M. Jones - 2.6.0-3 -- OCaml 4.11.1 rebuild - -* Fri Aug 21 2020 Richard W.M. Jones - 2.6.0-2 -- OCaml 4.11.0 rebuild - -* Fri Aug 7 2020 Jerry James - 2.6.0-1 -- Update to 2.6.0 -- Add ocaml-lwt-react-devel and ocaml-react-devel BRs -- Drop unneeded ocaml-bisect-ppx, ocaml-seq, and opam-installer BRs - -* Sat Aug 01 2020 Fedora Release Engineering - 2.4.3-5 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 2.4.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 05 2020 Richard W.M. Jones - 2.4.3-3 -- OCaml 4.11.0+dev2-2020-04-22 rebuild - -* Wed Apr 22 2020 Richard W.M. Jones - 2.4.3-2 -- OCaml 4.11.0 pre-release attempt 2 - -* Thu Apr 16 2020 Jerry James - 2.4.3-1 -- Update to 2.4.3 -- Add ocaml-bisect-ppx-devel BR -- Remove man page manipulations; they are installed where we want them now - -* Fri Jan 31 2020 Fedora Release Engineering - 2.4.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Dec 05 2019 Sergey Avseyev - 2.4.2-2 -- Require -devel packages of lwt and lambda-term for build step - -* Wed Oct 16 2019 Sergey Avseyev - 2.4.2-1 -- Update to 2.4.2 - -* Mon Aug 12 2019 Sergey Avseyev - 2.4.1-1 -- Update to 2.4.1 - -* Sat Jul 27 2019 Fedora Release Engineering - 2.3.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu May 09 2019 Sergey Avseyev - 2.3.0-2 -- Update build scripts - -* Fri Feb 01 2019 Sergey Avseyev - 2.3.0-1 -- Update to 2.3.0 - -* Mon Dec 03 2018 Sergey Avseyev - 2.2.0-4 -- Update URLs - -* Mon Dec 03 2018 Sergey Avseyev - 2.2.0-3 -- Rebuild with lambda-term 1.13 - -* Sun Aug 12 2018 Sergey Avseyev - 2.2.0-2 -- Fix installing man pages - -* Sun Jul 15 2018 Sergey Avseyev - 2.2.0-1 -- Update to 2.2.0 - -* Sat Jul 14 2018 Fedora Release Engineering - 2.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Apr 29 2018 Sergey Avseyev 2.1.0-2 -- Rebuild with findlib 1.8.0 - -* Mon Mar 05 2018 Sergey Avseyev 2.1.0-1 -- Initial packaging. diff --git a/sources b/sources index 8b46ffc..9c4ae6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (utop-2.17.0.tar.gz) = 0d4665f72379ef7d294517a3e3cd4e6facb109a59faa6df71fa7f9837664771a919639f035ddc41f51a60cfd4fc03c911d87c20b943a601e0abc3a1248140eab +SHA512 (utop-2.9.2.tbz) = db97275aa4bd7725a9eeec6d9155c239f3e48adf8d34b73f55caa2de32fde98862480db5e05dffc89e98efd12eb60e08d89ad34b9a92a8de0d37ccb32af07ddf diff --git a/utop-version.patch b/utop-version.patch deleted file mode 100644 index bb3c2d7..0000000 --- a/utop-version.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -durpNw utop-2.16.0/dune-project utop-2.16.0-1/dune-project ---- utop-2.16.0/dune-project 2025-07-22 07:19:24.000000000 -0600 -+++ utop-2.16.0-1/dune-project 2025-07-30 14:55:10.501079812 -0600 -@@ -1,6 +1,7 @@ - (lang dune 2.7) - (formatting (enabled_for dune)) - (name utop) -+(version 2.16.0) - - (generate_opam_files) - (source (github ocaml-community/utop)) -diff -up utop-2.16.0/src/lib/uTop.ml utop-2.16.0-1/src/lib/uTop.ml ---- utop-2.16.0/src/lib/uTop.ml 2025-07-22 07:19:24.000000000 -0600 -+++ utop-2.16.0-1/src/lib/uTop.ml 2025-07-30 14:55:38.012927962 -0600 -@@ -18,7 +18,7 @@ let (>>=) = Lwt.(>>=) - - module String_set = Set.Make(String) - --let version = "%%VERSION%%" -+let version = "2.16.0" - - (* +-----------------------------------------------------------------+ - | History | -diff -up utop-2.16.0/utop.opam utop-2.16.0-1/utop.opam ---- utop-2.16.0/utop.opam 2025-07-22 07:19:24.000000000 -0600 -+++ utop-2.16.0-1/utop.opam 2025-07-30 14:55:53.988878072 -0600 -@@ -1,3 +1,4 @@ -+version: "2.16.0" - # This file is generated by dune, edit dune-project instead - opam-version: "2.0" - synopsis: "Universal toplevel for OCaml" diff --git a/utop.spec b/utop.spec index 95ee2e4..e91fd8a 100644 --- a/utop.spec +++ b/utop.spec @@ -1,56 +1,44 @@ +%undefine _package_note_flags + # The OCaml code is byte compiled, not native compiled, so there are no ELF # objects in the binary RPM. %global debug_package %{nil} -%global giturl https://github.com/ocaml-community/utop - Name: utop -Version: 2.17.0 -Release: %autorelease +Version: 2.9.2 +Release: 6%{?dist} Summary: Improved toplevel for OCaml License: BSD-3-Clause -URL: https://ocaml-community.github.io/utop/ -VCS: git:%{giturl}.git -Source: %{giturl}/archive/%{version}/%{name}-%{version}.tar.gz -# Upstream patch to fix the version number -Patch: %{name}-version.patch +URL: https://github.com/ocaml-community/utop +Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tbz -# OCaml packages not built on i686 since OCaml 5 / Fedora 39. -ExcludeArch: %{ix86} - -BuildSystem: dune -BuildRequires: ocaml >= 4.11.0 -BuildRequires: ocaml-alcotest-devel +BuildRequires: ocaml >= 4.03.0 +BuildRequires: ocaml-camomile-devel BuildRequires: ocaml-cppo >= 1.1.2 -BuildRequires: ocaml-dune >= 2.7 +BuildRequires: ocaml-dune >= 1.0 BuildRequires: ocaml-findlib >= 1.7.2 BuildRequires: ocaml-lambda-term-devel >= 3.1.0 -BuildRequires: ocaml-logs-devel -BuildRequires: ocaml-lwt-devel BuildRequires: ocaml-lwt-react-devel BuildRequires: ocaml-react-devel >= 1.0.0 -BuildRequires: ocaml-xdg-devel >= 3.9.0 -BuildRequires: ocaml-zed-devel >= 3.2.0 # for utop.el -BuildRequires: emacs-nw +BuildRequires: emacs BuildRequires: emacs-tuareg Provides: ocaml-%{name}%{?_isa} = %{version}-%{release} %description -utop is an improved toplevel (i.e., Read-Eval-Print Loop) for OCaml. It can -run in a terminal or in Emacs. It supports line editing, history, real-time -and context sensitive completion, colors, and more. +utop is an improved toplevel (i.e., Read-Eval-Print Loop) for +OCaml. It can run in a terminal or in Emacs. It supports line +editing, history, real-time and context sensitive completion, +colors, and more. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: ocaml-findlib%{?_isa} Requires: ocaml-lambda-term-devel%{?_isa} -Requires: ocaml-logs-devel%{?_isa} -Requires: ocaml-zed-devel%{?_isa} %description devel The %{name}-devel package contains libraries and signature files for @@ -64,23 +52,27 @@ Requires: emacs-tuareg Recommends: emacs-company %description -n emacs-utop -This package contains an Emacs front end for utop, an improved toplevel for -OCaml. +This package contains an Emacs front end for utop, an improved toplevel +for OCaml. %prep -%autosetup -p1 +%autosetup + +%build +%dune_build -%build -a cd src/top emacs -batch --no-init-file --no-site-file \ - --eval "(let ((backup-inhibited t)) (loaddefs-generate \".\" \"$PWD/utop-loaddefs.el\"))" + --eval "(progn (setq generated-autoload-file \"$PWD/utop-autoloads.el\" backup-inhibited t) (update-directory-autoloads \".\"))" %_emacs_bytecompile utop.el cd - -%install -a +%install +%dune_install + # Install the Emacs interface mkdir -p %{buildroot}%{_emacs_sitestartdir} -cp -p src/top/utop-loaddefs.* %{buildroot}%{_emacs_sitestartdir} +cp -p src/top/utop-autoloads.* %{buildroot}%{_emacs_sitestartdir} cp -p src/top/utop.elc %{buildroot}%{_emacs_sitelispdir} %files -f .ofiles @@ -91,7 +83,138 @@ cp -p src/top/utop.elc %{buildroot}%{_emacs_sitelispdir} %files -n emacs-utop %{_emacs_sitelispdir}/%{name}.el* -%{_emacs_sitestartdir}/%{name}-loaddefs.el* +%{_emacs_sitestartdir}/%{name}-autoloads.el* %changelog -%autochangelog +* Tue Jan 24 2023 Richard W.M. Jones - 2.9.2-6 +- Rebuild OCaml packages for F38 + +* Sat Jan 21 2023 Fedora Release Engineering - 2.9.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Aug 18 2022 Jerry James - 2.9.2-4 +- Rebuild for ocaml-lwt 5.6.1 +- Convert License tag to SPDX + +* Sat Jul 23 2022 Fedora Release Engineering - 2.9.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 20 2022 Jerry James - 2.9.2-2 +- Use new OCaml macros + +* Sun Jun 19 2022 Richard W.M. Jones - 2.9.2-2 +- OCaml 4.14.0 rebuild + +* Thu Jun 16 2022 Jerry James - 2.9.2-1 +- Version 2.9.2 + +* Wed Apr 27 2022 Jerry James - 2.9.1-1 +- Version 2.9.1 + +* Fri Feb 04 2022 Richard W.M. Jones - 2.9.0-3 +- OCaml 4.13.1 rebuild to remove package notes + +* Sat Jan 22 2022 Fedora Release Engineering - 2.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Dec 10 2021 Jerry James - 2.9.0-1 +- Version 2.9.0 + +* Tue Oct 05 2021 Richard W.M. Jones - 2.8.0-3 +- OCaml 4.13.1 build + +* Fri Jul 23 2021 Fedora Release Engineering - 2.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 18 2021 Jerry James - 2.8.0-1 +- Version 2.8.0 +- New emacs-utop package to hold the Emacs interface + +* Thu Jun 3 2021 Richard W.M. Jones - 2.7.0-6 +- Rebuild for new ocaml-lwt. + +* Mon Mar 15 2021 Richard W.M. Jones - 2.7.0-5 +- Bump and rebuild for updated ocaml-findlib. + +* Mon Mar 1 19:52:15 GMT 2021 Richard W.M. Jones - 2.7.0-4 +- OCaml 4.12.0 build + +* Sat Feb 20 2021 Jerry James - 2.7.0-3 +- Rebuild for ocaml-lwt 5.4.0 + +* Wed Jan 27 2021 Fedora Release Engineering - 2.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jan 11 2021 Jerry James - 2.7.0-1 +- Version 2.7.0 + +* Wed Sep 02 2020 Richard W.M. Jones - 2.6.0-3 +- OCaml 4.11.1 rebuild + +* Fri Aug 21 2020 Richard W.M. Jones - 2.6.0-2 +- OCaml 4.11.0 rebuild + +* Fri Aug 7 2020 Jerry James - 2.6.0-1 +- Update to 2.6.0 +- Add ocaml-lwt-react-devel and ocaml-react-devel BRs +- Drop unneeded ocaml-bisect-ppx, ocaml-seq, and opam-installer BRs + +* Sat Aug 01 2020 Fedora Release Engineering - 2.4.3-5 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 2.4.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 05 2020 Richard W.M. Jones - 2.4.3-3 +- OCaml 4.11.0+dev2-2020-04-22 rebuild + +* Wed Apr 22 2020 Richard W.M. Jones - 2.4.3-2 +- OCaml 4.11.0 pre-release attempt 2 + +* Thu Apr 16 2020 Jerry James - 2.4.3-1 +- Update to 2.4.3 +- Add ocaml-bisect-ppx-devel BR +- Remove man page manipulations; they are installed where we want them now + +* Fri Jan 31 2020 Fedora Release Engineering - 2.4.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Dec 05 2019 Sergey Avseyev - 2.4.2-2 +- Require -devel packages of lwt and lambda-term for build step + +* Wed Oct 16 2019 Sergey Avseyev - 2.4.2-1 +- Update to 2.4.2 + +* Mon Aug 12 2019 Sergey Avseyev - 2.4.1-1 +- Update to 2.4.1 + +* Sat Jul 27 2019 Fedora Release Engineering - 2.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu May 09 2019 Sergey Avseyev - 2.3.0-2 +- Update build scripts + +* Fri Feb 01 2019 Sergey Avseyev - 2.3.0-1 +- Update to 2.3.0 + +* Mon Dec 03 2018 Sergey Avseyev - 2.2.0-4 +- Update URLs + +* Mon Dec 03 2018 Sergey Avseyev - 2.2.0-3 +- Rebuild with lambda-term 1.13 + +* Sun Aug 12 2018 Sergey Avseyev - 2.2.0-2 +- Fix installing man pages + +* Sun Jul 15 2018 Sergey Avseyev - 2.2.0-1 +- Update to 2.2.0 + +* Sat Jul 14 2018 Fedora Release Engineering - 2.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sun Apr 29 2018 Sergey Avseyev 2.1.0-2 +- Rebuild with findlib 1.8.0 + +* Mon Mar 05 2018 Sergey Avseyev 2.1.0-1 +- Initial packaging.