Fix a changelog entry

- Change http URLs to https

.gitignore

@@ -3,3 +3,4 @@
 /.build*.log
 /clog
 /virt-top-*.tar.gz
+/virt-top-*.tar.gz.sig

0001-libvirt-Handle-VIR_DOMAIN_PMSUSPENDED-state.patch

@@ -1,40 +0,0 @@
-From 24a461715d5bce47f63cb0097606fc336230589f Mon Sep 17 00:00:00 2001
-From: Stephane Glondu <steph@glondu.net>
-Date: Wed, 21 Aug 2019 17:24:47 +0200
-Subject: [PATCH] libvirt: Handle VIR_DOMAIN_PMSUSPENDED state.
-
-Fixes FTBFS with ocaml-libvirt 0.6.1.5.
-
-RWMJ: Added documentation and changed the letter to 'M'.
----
- src/screen.ml    | 1 +
- src/virt-top.pod | 4 ++++
- 2 files changed, 5 insertions(+)
-
-diff --git a/src/screen.ml b/src/screen.ml
-index 0d847a2..8a66ba6 100644
---- a/src/screen.ml
-+++ b/src/screen.ml
-@@ -50,3 +50,4 @@ let show_state = function
-   | D.InfoShutdown -> 'D'
-   | D.InfoShutoff -> 'O'
-   | D.InfoCrashed -> 'X'
-+  | D.InfoPMSuspended -> 'M'
-diff --git a/src/virt-top.pod b/src/virt-top.pod
-index 4d81608..76ad3f9 100644
---- a/src/virt-top.pod
-+++ b/src/virt-top.pod
-@@ -492,6 +492,10 @@ Shutdown.
- 
- Crashed.
- 
-+=item B<M>
-+
-+Suspended by guest power management.
-+
- =back
- 
- =item B<TIME>
--- 
-2.22.0
-

gating.yaml

@@ -1,7 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}

sources

@@ -1 +1,2 @@
-SHA512 (virt-top-1.0.9.tar.gz) = 3e0e52bece411f8b73c57beea554937d779bbfb18d16cf5b7f13f8c843e747c2d89ce8253b9cf4db2bd6495c4e4826cb68467cc48bb53bfd65c4aceed043d086
+SHA512 (virt-top-1.1.2.tar.gz) = 1dd495daf106601236680b6d028262a217b8b93edb51c3f6c148fef7b452d8d188f1df18d500338377d9becff2174a6e33ccda4eaa913e7a159820d7bfca3a3c
+SHA512 (virt-top-1.1.2.tar.gz.sig) = db754791923aa30838b5f33bd6a523fda4a34068e9b20cdedc09e56a72de7e894f156e70106c5274f9e8121dde25cfc594e9fcb932dca08af15fe67e0c27990a

virt-top.spec

@@ -1,39 +1,41 @@
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%global debug_package %{nil}
+# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
+ExcludeArch: %{ix86}
 
 Name:           virt-top
-Version:        1.0.9
-Release:        18%{?dist}
+Version:        1.1.2
+Release:        5%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
-License:        GPLv2+
+License:        GPL-2.0-or-later
 
-URL:            http://people.redhat.com/~rjones/virt-top/
-Source0:        http://people.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz
+%if 0%{?rhel}
+# No qemu-kvm on POWER (RHBZ#1946532).
+ExcludeArch:    %{power64}
+%endif
+
+URL:            https://people.redhat.com/~rjones/virt-top/
+Source0:        https://people.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz
+Source1:        https://people.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz.sig
 
 # Post-process output of CSV file (RHBZ#665817, RHBZ#912020).
-Source1:        processcsv.py
-Source2:        processcsv.py.pod
+Source2:        processcsv.py
+Source3:        processcsv.py.pod
+
+# Keyring used to verify tarball signature.
+Source4:        libguestfs.keyring
 
 # Adds a link to processcsv to the man page.  This patch is only
 # included in RHEL builds.
-Patch0:         virt-top-1.0.9-processcsv-documentation.patch
+Patch1:         virt-top-1.0.9-processcsv-documentation.patch
 
-# Upstream patch to fix FTBFS with ocaml libvirt 0.6.1.5.
-Patch1:         0001-libvirt-Handle-VIR_DOMAIN_PMSUSPENDED-state.patch
-
-BuildRequires: make
+BuildRequires:  gcc
+BuildRequires:  make
 BuildRequires:  ocaml >= 3.10.2
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-findlib-devel
 # Need the ncurses / ncursesw (--enable-widec) fix.
 BuildRequires:  ocaml-curses-devel >= 1.0.3-7
-BuildRequires:  ocaml-extlib-devel
-BuildRequires:  ocaml-xml-light-devel
-BuildRequires:  ocaml-csv-devel
 BuildRequires:  ocaml-calendar-devel
 BuildRequires:  ocaml-libvirt-devel >= 0.6.1.5
-
-# Tortuous list of BRs for gettext.
 BuildRequires:  ocaml-gettext-devel >= 0.3.3
 BuildRequires:  ocaml-fileutils-devel
 # For msgfmt:
@@ -41,9 +43,11 @@ BuildRequires:  gettext
 
 # Non-OCaml BRs.
 BuildRequires:  libvirt-devel
+BuildRequires:  libxml2-devel
 BuildRequires:  perl-interpreter
 BuildRequires:  perl(Pod::Perldoc)
 BuildRequires:  gawk
+BuildRequires:  gnupg2
 
 
 %description
@@ -56,34 +60,30 @@ different virtualization systems.
 
 
 %prep
+%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %setup -q
 
 %if 0%{?rhel} >= 6
-%patch0 -p1
+%patch -P1 -p1
 %endif
 
-%patch1 -p1
+# "ocamlfind byte" has been removed as an alias
+sed -i 's/\(OCAMLBEST=\)byte/\1ocamlc/' configure
 
 
 %build
 %configure
-make all
-%if %opt
-make opt
-strip src/virt-top.opt
-%endif
-
-# Build translations.
-make -C po
+make
 
 # Force rebuild of man page.
+# There is a missing man_MANS rule, will fix upstream in next version.
 rm -f src/virt-top.1
 make -C src virt-top.1
 
 %if 0%{?rhel} >= 6
 # Build processcsv.py.1.
 pod2man -c "Virtualization Support" --release "%{name}-%{version}" \
-  %{SOURCE2} > processcsv.py.1
+  %{SOURCE3} > processcsv.py.1
 %endif
 
 
@@ -91,17 +91,15 @@ pod2man -c "Virtualization Support" --release "%{name}-%{version}" \
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # Install translations.
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale
-make -C po install PODIR="$RPM_BUILD_ROOT%{_datadir}/locale"
 %find_lang %{name}
 
-# Install virt-top manpage by hand for now.
+# Install virt-top manpage by hand for now - see above.
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 install -m 0644 src/virt-top.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 %if 0%{?rhel} >= 6
 # Install processcsv.py.
-install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
+install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}
 
 # Install processcsv.py(1).
 install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -109,7 +107,8 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %files -f %{name}.lang
-%doc COPYING README TODO ChangeLog
+%doc README TODO
+%license COPYING
 %{_bindir}/virt-top
 %{_mandir}/man1/virt-top.1*
 %if 0%{?rhel} >= 6
@@ -119,9 +118,118 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
-* Mon Mar  8 2021 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-18
+* Tue Oct 14 2025 Richard W.M. Jones <rjones@redhat.com> - 1.1.2-5
+- OCaml 5.4.0 rebuild
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Mon Jul 07 2025 Jerry James <loganjerry@gmail.com> - 1.1.2-3
+- Rebuild to fix OCaml dependencies
+- Change http URLs to https
+
+* Thu Apr 03 2025 Richard W.M. Jones <rjones@redhat.com> - 1.1.2-2
+- Enable ocaml-gettext again
+
+* Fri Feb 28 2025 Richard W.M. Jones <rjones@redhat.com> - 1.1.2-1
+- New upstream version 1.1.2
+- Disable gettext support in Fedora Rawhide
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Fri Jan 10 2025 Jerry James <loganjerry@gmail.com> - 1.1.1-22
+- OCaml 5.3.0 rebuild for Fedora 42
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Jun 19 2024 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-20
+- OCaml 5.2.0 ppc64le fix
+
+* Thu May 30 2024 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-19
+- OCaml 5.2.0 for Fedora 41
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-17
+- OCaml 5.1.1 + s390x code gen fix for Fedora 40
+
+* Tue Dec 12 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-16
+- OCaml 5.1.1 rebuild for Fedora 40
+
+* Mon Nov 27 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-15
+- Fix build issue with libxml2 2.12.1
+
+* Thu Oct 05 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-14
+- OCaml 5.1 rebuild for Fedora 40
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jul 11 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-12
+- OCaml 5.0 rebuild for Fedora 39
+
+* Mon Jul 10 2023 Jerry James <loganjerry@gmail.com> - 1.1.1-11
+- OCaml 5.0.0 rebuild
+- Add patch to fix linking on bytecode-only architectures
+- Update deprecated %%patchN usage
+- Use %%license macro
+
+* Mon Jun 05 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-10
+- Migrated to SPDX license
+
+* Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-9
+- Rebuild OCaml packages for F38
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Nov 28 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-7
+- Fix "Input/output error" in journal (RHBZ#2148798)
+
+* Tue Oct 18 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-6
+- Check tarball signature
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sun Jun 19 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-4
+- OCaml 4.14.0 rebuild
+
+* Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-3
+- OCaml 4.13.1 rebuild to remove package notes
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Nov 03 2021 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-1
+- New upstream development version 1.1.1
+- No longer depends on ocaml-csv, ocaml-extlib or ocaml-xml-light
+- Adds new dependency on libxml2
+
+* Tue Oct 05 2021 Richard W.M. Jones <rjones@redhat.com> - 1.1.0-2
+- OCaml 4.13.1 build
+
+* Fri Oct 01 2021 Richard W.M. Jones <rjones@redhat.com> - 1.1.0-1
+- New upstream development version 1.1.0
+- Upstream switched to automake, simplifying the downstream build slightly.
+- Remove Changelog file, no longer included upstream.
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri May 07 2021 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-20
+- Do not include the package on POWER on RHEL 9
+  resolves: rhbz#1956935
+
+* Mon Mar  8 2021 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-19
 - Bump and rebuild for ocaml-gettext update.
 
+* Tue Mar  2 10:06:37 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-18
+- OCaml 4.12.0 build
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild