From 03231876ae9e8439177a56585301cc1a47b5bca5 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 2 Mar 2021 10:06:38 +0000
Subject: [PATCH 01/40] OCaml 4.12.0 build

---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index 6b08e6b..74703d7 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,7 +3,7 @@
 
 Name:           virt-top
 Version:        1.0.9
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPLv2+
 
@@ -119,6 +119,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From 1679dffe3c705c25667b86196ef26978a6a13cc8 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 8 Mar 2021 12:22:04 +0000
Subject: [PATCH 02/40] Bump and rebuild for ocaml-gettext update.

---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index 74703d7..c24c96b 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,7 +3,7 @@
 
 Name:           virt-top
 Version:        1.0.9
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPLv2+
 
@@ -119,6 +119,9 @@ 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-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
 

From 10a4ef41ea11a7d5069e0d2fab8869fc94092c06 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 8 Mar 2021 12:25:41 +0000
Subject: [PATCH 03/40] Bump and rebuild for ocaml-gettext update.

---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index 6b08e6b..3a10194 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,7 +3,7 @@
 
 Name:           virt-top
 Version:        1.0.9
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPLv2+
 
@@ -119,6 +119,9 @@ 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
+- Bump and rebuild for ocaml-gettext update.
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From 8b4a0bddfae616829f6eeb322cb4b51774ef493e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 7 May 2021 13:35:05 +0100
Subject: [PATCH 04/40] Do not include the package on POWER on RHEL 9  
 resolves: rhbz#1956935

---
 virt-top.spec | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index c24c96b..af845ae 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,10 +3,15 @@
 
 Name:           virt-top
 Version:        1.0.9
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPLv2+
 
+%if 0%{?rhel}
+# No qemu-kvm on POWER (RHBZ#1946532).
+ExcludeArch:    %{power64}
+%endif
+
 URL:            http://people.redhat.com/~rjones/virt-top/
 Source0:        http://people.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz
 
@@ -119,6 +124,10 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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.
 

From f66a45e5693b0cd6a73b5edb8da555ae7e53ac62 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 23 Jul 2021 20:33:34 +0000
Subject: [PATCH 05/40] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index af845ae..9af683c 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,7 +3,7 @@
 
 Name:           virt-top
 Version:        1.0.9
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPLv2+
 
@@ -124,6 +124,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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

From 3d2e7bcbbf2901fe78d0e0a72fd830a19f111ab7 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 1 Oct 2021 16:49:16 +0100
Subject: [PATCH 06/40] New upstream development version 1.1.0

Upstream switched to automake, simplifying the downstream build slightly.
Remove Changelog file, no longer included upstream.
---
 .gitignore                                    |  1 +
 ...-Handle-VIR_DOMAIN_PMSUSPENDED-state.patch | 40 -------------------
 sources                                       |  3 +-
 virt-top.spec                                 | 33 +++++----------
 4 files changed, 14 insertions(+), 63 deletions(-)
 delete mode 100644 0001-libvirt-Handle-VIR_DOMAIN_PMSUSPENDED-state.patch

diff --git a/.gitignore b/.gitignore
index 1362986..b4fa33e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /.build*.log
 /clog
 /virt-top-*.tar.gz
+/virt-top-1.1.0.tar.gz.sig
diff --git a/0001-libvirt-Handle-VIR_DOMAIN_PMSUSPENDED-state.patch b/0001-libvirt-Handle-VIR_DOMAIN_PMSUSPENDED-state.patch
deleted file mode 100644
index c29b6d6..0000000
--- a/0001-libvirt-Handle-VIR_DOMAIN_PMSUSPENDED-state.patch
+++ /dev/null
@@ -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
-
diff --git a/sources b/sources
index e636d25..9356566 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (virt-top-1.0.9.tar.gz) = 3e0e52bece411f8b73c57beea554937d779bbfb18d16cf5b7f13f8c843e747c2d89ce8253b9cf4db2bd6495c4e4826cb68467cc48bb53bfd65c4aceed043d086
+SHA512 (virt-top-1.1.0.tar.gz) = 4d59b157dcfdad7686083166d05b153a3a1de318e46dc0e64e30cc50c86eea9fb80164c20c8d7c243371e9f63b200dfaaa66a7433aa10c7b332d7800bec3fa20
+SHA512 (virt-top-1.1.0.tar.gz.sig) = ccffb854db2bf5234b43faac9e8f72062167c730671413d601516181067c1a62d35668e9c7833a038e786e6d1214e12b66c82ea4ea4da9ac52d79cbadb1ab16a
diff --git a/virt-top.spec b/virt-top.spec
index 9af683c..91cd381 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -1,9 +1,6 @@
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%global debug_package %{nil}
-
 Name:           virt-top
-Version:        1.0.9
-Release:        21%{?dist}
+Version:        1.1.0
+Release:        1%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPLv2+
 
@@ -23,9 +20,6 @@ Source2:        processcsv.py.pod
 # included in RHEL builds.
 Patch0:         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:  ocaml >= 3.10.2
 BuildRequires:  ocaml-ocamldoc
@@ -67,21 +61,13 @@ different virtualization systems.
 %patch0 -p1
 %endif
 
-%patch1 -p1
-
 
 %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
 
@@ -96,11 +82,9 @@ 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
 
@@ -114,7 +98,7 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %files -f %{name}.lang
-%doc COPYING README TODO ChangeLog
+%doc COPYING README TODO
 %{_bindir}/virt-top
 %{_mandir}/man1/virt-top.1*
 %if 0%{?rhel} >= 6
@@ -124,6 +108,11 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From 5d81bc92af7541f343b930c0be3509e24d650cf3 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 5 Oct 2021 11:02:05 +0100
Subject: [PATCH 07/40] OCaml 4.13.1 build

---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index 91cd381..6f8a900 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -1,6 +1,6 @@
 Name:           virt-top
 Version:        1.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPLv2+
 
@@ -108,6 +108,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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.

From db056825e5f897328fca27cdd9591b6aa4da79a8 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 3 Nov 2021 20:27:58 +0000
Subject: [PATCH 08/40] New upstream development version 1.1.1

No longer depends on ocaml-csv, ocaml-extlib or ocaml-xml-light
Adds new dependency on libxml2
---
 .gitignore    |  2 +-
 sources       |  4 ++--
 virt-top.spec | 18 ++++++++++--------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index b4fa33e..bebb6a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@
 /.build*.log
 /clog
 /virt-top-*.tar.gz
-/virt-top-1.1.0.tar.gz.sig
+/virt-top-*.tar.gz.sig
diff --git a/sources b/sources
index 9356566..982081e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-top-1.1.0.tar.gz) = 4d59b157dcfdad7686083166d05b153a3a1de318e46dc0e64e30cc50c86eea9fb80164c20c8d7c243371e9f63b200dfaaa66a7433aa10c7b332d7800bec3fa20
-SHA512 (virt-top-1.1.0.tar.gz.sig) = ccffb854db2bf5234b43faac9e8f72062167c730671413d601516181067c1a62d35668e9c7833a038e786e6d1214e12b66c82ea4ea4da9ac52d79cbadb1ab16a
+SHA512 (virt-top-1.1.1.tar.gz) = 4f4c7338f1ce1f82b1a9287c256da4b60d7b2e5163ea4b19eb0257c104303dcecf28177f8034e34d255fec462adc19ab61e6a4b9db857da02f2cdf2b1c818093
+SHA512 (virt-top-1.1.1.tar.gz.sig) = 6236b7a68492663d743f1ee2e50ea91adafab97654c333d2b92f66a0c7a9cd5d6748fe2467f29db80c65428d804624a42d64f3ee7d0d09f612e95effec0e395e
diff --git a/virt-top.spec b/virt-top.spec
index 6f8a900..bcbe7be 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -1,6 +1,6 @@
 Name:           virt-top
-Version:        1.1.0
-Release:        2%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPLv2+
 
@@ -20,19 +20,15 @@ Source2:        processcsv.py.pod
 # included in RHEL builds.
 Patch0:         virt-top-1.0.9-processcsv-documentation.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:
@@ -40,6 +36,7 @@ BuildRequires:  gettext
 
 # Non-OCaml BRs.
 BuildRequires:  libvirt-devel
+BuildRequires:  libxml2-devel
 BuildRequires:  perl-interpreter
 BuildRequires:  perl(Pod::Perldoc)
 BuildRequires:  gawk
@@ -108,6 +105,11 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From 1dfa1d2d823351930b7312f11d89cb72f5dbf4fc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jan 2022 04:04:17 +0000
Subject: [PATCH 09/40] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index bcbe7be..82d9a05 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -1,6 +1,6 @@
 Name:           virt-top
 Version:        1.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPLv2+
 
@@ -105,6 +105,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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

From dc915fcb5067acb7fd3ff8587d231b121c682f3d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 4 Feb 2022 16:49:37 +0000
Subject: [PATCH 10/40] OCaml 4.13.1 rebuild to remove package notes

---
 virt-top.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index 82d9a05..fbf1edc 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -1,6 +1,7 @@
+%undefine _package_note_flags
 Name:           virt-top
 Version:        1.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPLv2+
 
@@ -105,6 +106,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From 2cc05c111c5478ac998385bfa12a00623757319a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 5 Feb 2022 08:55:52 +0000
Subject: [PATCH 11/40] Remove gating test

Adds no value and creates problems.  See discussion:
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/UK3B6G444WCCX7JLHBZSUH23YPLG2Z6M/
---
 gating.yaml | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 gating.yaml

diff --git a/gating.yaml b/gating.yaml
deleted file mode 100644
index 282e16b..0000000
--- a/gating.yaml
+++ /dev/null
@@ -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}

From 15d1dcdfa3473b397597b9e2b73fa19b146b0c68 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sun, 19 Jun 2022 11:51:51 +0100
Subject: [PATCH 12/40] OCaml 4.14.0 rebuild

---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index fbf1edc..7d30471 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -1,7 +1,7 @@
 %undefine _package_note_flags
 Name:           virt-top
 Version:        1.1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPLv2+
 
@@ -106,6 +106,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From e3581420679aea06b69be1a74695396f5e27def7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 23 Jul 2022 11:59:32 +0000
Subject: [PATCH 13/40] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index 7d30471..7fbd2e3 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -1,7 +1,7 @@
 %undefine _package_note_flags
 Name:           virt-top
 Version:        1.1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPLv2+
 
@@ -106,6 +106,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From e50441f17b8cfd671e99f4e42e67d60b7c69e9b7 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 18 Oct 2022 14:09:32 +0100
Subject: [PATCH 14/40] Check tarball signature

---
 libguestfs.keyring | Bin 0 -> 2823 bytes
 virt-top.spec      |  19 ++++++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 libguestfs.keyring

diff --git a/libguestfs.keyring b/libguestfs.keyring
new file mode 100644
index 0000000000000000000000000000000000000000..bb3eb5537b7c398a10b7e2b26ca00af011d1a73e
GIT binary patch
literal 2823
zcma*o_cI%g0s!zNh@cv+7)4sDC~4KE_7;1u)D}doT2(9drl?iaDypbGOYOv{*;+Ne
z_NqOjH0s^=-MxG7-Mt^)|M0o{WP+$kwNm-IfHZ)i6Laf8iDHZe#RnxvK!O)6rq(SO
z@nx&>aN10t6koV0fbtX7ACWsLI0FyJ@Pfu|=B(A~m#PuweNW!6ZNw+iE3ku-=2jTl
z-R1Kp&IJO$u+0}F)tr1faEy{Y7^AhU)R~C@f;L|U(;bZA7XFYV$_df=Lk(rcmOkB;
z)S!`^x0lVz=h?HQMv1soy+K~IC@;3ib@n&WJo)^vM=e&012y5w5lC{1Vr$%-f)DP%
zG8>+0I6T|x0-c17DN0oD5G)GJ#Tv0QA`_&1YxON$_gR+nsxWeR@+*U|;ZLu`<~ZZL
zb}lAl0+}{y9KH#`dC0F=fKw4mK4tiq#hTXnNO|A2&LnCbl}J*`J=P6P2w)t%_#~Ni
z<5CX?FlaaK45s4fc+`zxL=1ZQlr;uF8MB%kfJe&QF}FT<xowro@4(Dy{Cm>U2GrLW
zqJoL`^QF5~7La|K*qp<&i|iiuwuG5-c+Y`9hLqVU0-*=rT}zW^h4{n!24-?!w5B5L
zJDHd~YR;~9RmRo6SXRVZTVuupiWE+tcT#U?Vt3D|Yd`JQml+mOs0ksk06veG>Pp2z
z#$gwujCGqx!3oGYFjf5`VZ%40WH@#DMU8px4r`anayTMxVa8S98{78$W{Y!;Tf&rt
zSzNbt%vP(LA0kH72+RFIT%0S@6L1R%0M>KpIoe{ZJ<zPiyqdhMYHqG}o~)7{j<y(C
zYgbphSB}=aZXOQOF(5HgS|A8;pA7W39uPALn2G{IP67hcK|mCgRHXDE5+LX<5X2A+
zproKl_Du9#Zo=eyF+zzHysCQW`3yF<a^`H9>&?|OTt7orQ0hH2yK~J}8JshZ@W!LI
z-M4NO3G6uuXK5#0R%+aih%MZ^WFL9}_K$Qbehiq7*6e-`(+o69#+mu^SL`>(PjE?$
z9v&ppPtvAeurx2;DNmz|ZRT#yC%{HfUf3#G4T^=Mjr9Px1o2T4n<Ytniq4Qx^sH>R
zZ1pdjh{60h=v?i`kcvw;`D)ye0%1PQ9?@pTf4x9Uy*qWbcDF?m^#|U=sZiOQBTv2Y
z(~KQ*e#|T6$(d4Ts2j0br{Rses!aL;(crmXCLY4B&~}|^F%LvR>xZ{aykw4w)kp)G
z4Osxb<}R=Iv!|oBc|z)k#uVLs?9`AhKe_lhLRpA)6F3r*Zqo3lPHe9ol81_qi|G6E
z4o8p3JOnWhHo?+waZ$Tpb-(8=hsu=04#-d2e^N!szo*8Pi~oqA#cCE_@*SO{6sje$
z@TI6RMbo~Lb#1F(g%6Q&6{<mn1ENq?rgtP=MR`X#m3(H9br{2A@yh%Qo^Cz1pWRw>
zGhr{7C@+l6doz=%hN^mxA)?LclnP^x9TpX)wspTkY{ZP}b>$Zd6`^l+ApCE`-U~Y0
z8dQ_!`=HxQOf%|&`*eUUp8m%S1qlC9x|sX|LVV>m!3iJpL3q~u?Yr_&_bqw@GMgtb
zN3h@AXg%lu6!!dYX|f)6XpFTNudSQQe-nF3_5TuMQ>Fowak8uAJT7I5#M21UX135g
zGs~4Rv<`522?`g~<~erUc;O#Fw;!L^bk+?M%vhK)dA(f}R;1HN;I3iF(sri&RGg#@
zmLH6Hvl@qcHG3<o(%-y6xLy|>@}a7PDlc*>8}W{`e__2>^mdZUqS>0?4cjI;Dtk!{
zw(y-Wq;TG}(Orqzk!Z%c%|qPg+y}T~ejB&}4bg}GSaRBuhJ5&ZtU(q$-2TO%x?bKn
zU1C)(Zk#(Ue^|~mKr$>J`z}2l$uKQrztdude9E`_5nY=j(7beJO!_Lu=p~Umx*Bbe
zaaXv_>XI}z5OKTqMuad$__xSPg7-(2T1z6Buf*FzTSBfhvZQ;&s%lAiRiC1qU!;#{
z?a-99*ww>gj$}coPZCZ=kn2x>W_Sm-wW8Tnxif_54<1wj?Yww`ghQ!<%2;(ex~CZS
zA?P=)tdq7Dkzqb|PG;C0ai!-2Q}RaDC$I}%efl;L=XIxts=E7olcp#We%A3nmv>An
zB(K#6d`=!EO{bI5n@^pN{57JI|8!|wis(l^Y83K&k&{mbs*Sg0F_LnBTp6U0nhVFs
zKNtCW5Kw~{od{S8=fq-k&tLtin0=hH{bySx^qNerUuEu@8K=ce1h<!XZIfdnUQH2o
zkisz;vaJE-Q4hIA==iKYt6~(P-Z&Tn2>l}X`QND>DbTX&E$#Fqr>x8dD+%_ia%sA&
z-@-E*k_;lOcEc%6!hgZXyKo9HW@$loJcll?W#7v3av>4)xk)$5uW9Xl12{vPP#z`m
zs2LrYwcDJ&HuK}b>kIRTnf*>e6iy|jj4e6UTDs}z{H{%;>o`28AchP`#1vkm9%H*S
zoU>DWN;;Bf(C({v%Oa!+`GzIYlq}nbB@yDgTO{;r`S7a>(eUJc9dp#8x&m$~?E>Xu
zQZmBuyhnH{K?-A&Xb*XP+gLf1SLt4Z^c%7G#xO1hI(zGmafx@1gQYru<*%)iZ_dBb
z|Bb1aek<TxI<KEl$mZP~LQz=kyr}w<#qp*E05eZ?*$*A?=cbaL*5jpU@+9lG!e>=H
z10)q1$4)>Do*ODQWg)QV#uOR!W%mWq@$ijmO%<)Dw`_}VtiAD7H5t~=RB~bQs5ra`
z{QU>p<x$&YL*k8pAW-dx$chMT$90)t*!v1NK<&Ou-SK81&?DdiM*yc;`sFv+Zg#EN
z8b?=xA<Av)V<$1B$fiOj8OCoHld~t+(D<SFAsVJ-oIJepBbS=U&zN78Qnc&cb~*%A
zkfID++-o{&ytionDQp4@kph%6@xxq|IQPlb7@*2^n>G`sAB!wj<-$;hilBy>4_~OJ
z%0_>c24yng<lo6M#*#62%^4k@-}+~2F`#>-j6e{8;$K_c_|KG(_0Vgl=ucn~i1=x;
zm1?xq_{fi_!ESgT8TSC6zV8=KU~}{8(Uba&{@Aa*HUiPNuMfwx8iMynCX$p_SHS1q
z?H$wO+UHHDDFVH{JO$}0dbDQ~KlwK(d(_iUCGf`Lc9V*IhQhxeD>9vpy|`)~+um=D
zg<8_$!w*H}5~0!TlT&@NLjHT=7oM!nTRWd6X`@!!wmnL&U!>jUUx&4}yFY={wB8Nh
zA0w#m_%Uc5ra3z_s6d+}gYQb!bB$suWZS)^%eRI~!J$G4-{nibYcoyw$8F-)9GhwL
zf^`wukA9opp_kHg$rT81yy?ZwxKcCuY&Q-Tgt#e|=%fp}c+1aw|3(R~opy=CE+z?b
z(>ZkYs>9)myz%Pn7-DP|f|$$RG@K;3*Nl@9ueJ1h%e-Y|PoG^3Zj$gJ#i&h}JG=F9
zm>>;qK4MTXwg%V0Aa!hzB$@>;3Lj>+*kFFI<>e{edDH)+`)Mn$^g1(hKL{1kC+A_C
zjW|_`i^xn9b9DCEvrOrD6cpeXE)tMl%g%g8133|+O&aU#Vo9Kcq<WViNMrGY<8E2D
zk@HXw)%n{qt|eW{H*AG^oC;~$*CoZ9k0Rg|KXO+9eJn!o&Pj*4O-(B!*ip6p*_wj8
mAr~0KYkj!ddXR=vhyG!WGpK}Pa+L{K-LdU)InmXx_WuA;2Rga{

literal 0
HcmV?d00001

diff --git a/virt-top.spec b/virt-top.spec
index 7fbd2e3..5e3ad72 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -1,7 +1,7 @@
 %undefine _package_note_flags
 Name:           virt-top
 Version:        1.1.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPLv2+
 
@@ -12,10 +12,14 @@ ExcludeArch:    %{power64}
 
 URL:            http://people.redhat.com/~rjones/virt-top/
 Source0:        http://people.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz
+Source1:        http://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.
@@ -41,6 +45,7 @@ BuildRequires:  libxml2-devel
 BuildRequires:  perl-interpreter
 BuildRequires:  perl(Pod::Perldoc)
 BuildRequires:  gawk
+BuildRequires:  gnupg2
 
 
 %description
@@ -53,6 +58,7 @@ different virtualization systems.
 
 
 %prep
+%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %setup -q
 
 %if 0%{?rhel} >= 6
@@ -72,7 +78,7 @@ 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
 
 
@@ -88,7 +94,7 @@ 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/
@@ -106,6 +112,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From 11384f44d33ae27e8f88469a62483c0c3213aebf Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 28 Nov 2022 11:33:10 +0000
Subject: [PATCH 15/40] Fix "Input/output error" in journal (RHBZ#2148798)

---
 ...-explicitly-disconnect-from-libvirtd.patch | 39 +++++++++++++++++++
 virt-top.spec                                 | 13 +++++--
 2 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 0001-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch

diff --git a/0001-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch b/0001-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch
new file mode 100644
index 0000000..330091f
--- /dev/null
+++ b/0001-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch
@@ -0,0 +1,39 @@
+From 4b15ee2440b0e70e3c1eb5e164ded493e2d8f0c8 Mon Sep 17 00:00:00 2001
+From: Yuya Higashi <higashi.yuya@fujitsu.com>
+Date: Tue, 15 Nov 2022 13:56:21 +0900
+Subject: [PATCH] virt-top: fix to explicitly disconnect from libvirtd
+
+To prevent libvirtd from printing virNetSocketReadWire I/O errors when
+the virt-top command exits, explicitly disconnect from libvirtd.
+
+Signed-off-by: Yuya Higashi <higashi.yuya@fujitsu.com>
+---
+ src/top.ml | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/top.ml b/src/top.ml
+index 75fbcb9..cbe655a 100644
+--- a/src/top.ml
++++ b/src/top.ml
+@@ -306,7 +306,7 @@ let get_string maxlen =
+   )
+ 
+ (* Main loop. *)
+-let rec main_loop ((_, batch_mode, script_mode, csv_enabled, stream_mode, _, _, _)
++let rec main_loop ((conn, batch_mode, script_mode, csv_enabled, stream_mode, _, _, _)
+ 		     as setup) =
+   let csv_flags = !csv_cpu, !csv_mem, !csv_block, !csv_net in
+ 
+@@ -372,7 +372,8 @@ let rec main_loop ((_, batch_mode, script_mode, csv_enabled, stream_mode, _, _,
+       if not !quit || !end_time <> None then
+ 	millisleep delay
+     )
+-  done
++  done;
++  C.close conn
+ 
+ and get_key_press setup delay =
+   (* Read the next key, waiting up to 'delay' milliseconds. *)
+-- 
+2.31.1
+
diff --git a/virt-top.spec b/virt-top.spec
index 5e3ad72..9f5a6cc 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -1,7 +1,7 @@
 %undefine _package_note_flags
 Name:           virt-top
 Version:        1.1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPLv2+
 
@@ -23,7 +23,10 @@ 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
+
+# Fix "Input/output error" in journal (RHBZ#2148798)
+Patch2:         0001-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch
 
 BuildRequires:  gcc
 BuildRequires:  make
@@ -62,8 +65,9 @@ different virtualization systems.
 %setup -q
 
 %if 0%{?rhel} >= 6
-%patch0 -p1
+%patch1 -p1
 %endif
+%patch2 -p1
 
 
 %build
@@ -112,6 +116,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From cd9985ceab24211f55df5bef71b3546cc1e3afb7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 21 Jan 2023 06:23:35 +0000
Subject: [PATCH 16/40] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index 9f5a6cc..54be267 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -1,7 +1,7 @@
 %undefine _package_note_flags
 Name:           virt-top
 Version:        1.1.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPLv2+
 
@@ -116,6 +116,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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)
 

From 2610ea24a32e2da3de4073c5a287174328ab596a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 24 Jan 2023 18:07:58 +0000
Subject: [PATCH 17/40] Rebuild OCaml packages for F38

---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index 54be267..ba60448 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -1,7 +1,7 @@
 %undefine _package_note_flags
 Name:           virt-top
 Version:        1.1.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPLv2+
 
@@ -116,6 +116,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From 28f5329fbbeede78c03c3b7d6a9e3f0ab1f73dec Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 5 Jun 2023 16:09:11 +0100
Subject: [PATCH 18/40] Migrated to SPDX license

---
 virt-top.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/virt-top.spec b/virt-top.spec
index ba60448..e4cfba6 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -1,9 +1,9 @@
 %undefine _package_note_flags
 Name:           virt-top
 Version:        1.1.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
-License:        GPLv2+
+License:        GPL-2.0-or-later
 
 %if 0%{?rhel}
 # No qemu-kvm on POWER (RHBZ#1946532).
@@ -116,6 +116,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From 423f9604a55d1b45b16c1acad78f7a26f7979c9b Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Mon, 10 Jul 2023 22:50:52 -0600
Subject: [PATCH 19/40] OCaml 5.0.0 rebuild

Other changes:
- Add patch to fix linking on bytecode-only architectures
- Update deprecated %patchN usage
- Use %license macro
---
 virt-top-1.1.1-ocaml-bytecode.patch | 28 ++++++++++++++++++++++++++++
 virt-top.spec                       | 25 ++++++++++++++++++++-----
 2 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 virt-top-1.1.1-ocaml-bytecode.patch

diff --git a/virt-top-1.1.1-ocaml-bytecode.patch b/virt-top-1.1.1-ocaml-bytecode.patch
new file mode 100644
index 0000000..d156272
--- /dev/null
+++ b/virt-top-1.1.1-ocaml-bytecode.patch
@@ -0,0 +1,28 @@
+--- virt-top-1.1.1/configure.orig	2021-11-03 14:18:26.000000000 -0600
++++ virt-top-1.1.1/configure	2023-07-10 12:31:15.525435684 -0600
+@@ -5357,7 +5357,7 @@ else
+   OCAMLOPT="$ac_cv_prog_OCAMLOPT"
+ fi
+ 
+-     OCAMLBEST=byte
++     OCAMLBEST=ocamlc
+      if test "$OCAMLOPT" = "no"; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find ocamlopt; bytecode compilation only." >&5
+ $as_echo "$as_me: WARNING: Cannot find ocamlopt; bytecode compilation only." >&2;}
+--- virt-top-1.1.1/ocaml-link.sh.in.orig	2021-11-03 06:00:07.000000000 -0600
++++ virt-top-1.1.1/ocaml-link.sh.in	2023-07-10 12:31:41.012064849 -0600
+@@ -49,10 +49,12 @@ if [ x"${V:-@AM_DEFAULT_VERBOSITY@}" = x
+   echo "$@" \
+      @OCAML_RUNTIME_VARIANT_PIC_OPTION@ \
+      -linkpkg \
+-     -cclib "'@LDFLAGS@ $cclib'"
++     -cclib "'@LDFLAGS@ $cclib'" \
++     -output-complete-exe
+ fi
+ # NB -cclib must come last.
+ exec "$@" \
+      @OCAML_RUNTIME_VARIANT_PIC_OPTION@ \
+      -linkpkg \
+-     -cclib "@LDFLAGS@ $cclib"
++     -cclib "@LDFLAGS@ $cclib" \
++     -output-complete-exe
diff --git a/virt-top.spec b/virt-top.spec
index e4cfba6..4d8f617 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -1,7 +1,6 @@
-%undefine _package_note_flags
 Name:           virt-top
 Version:        1.1.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPL-2.0-or-later
 
@@ -28,6 +27,9 @@ Patch1:         virt-top-1.0.9-processcsv-documentation.patch
 # Fix "Input/output error" in journal (RHBZ#2148798)
 Patch2:         0001-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch
 
+# Fix linking problems on bytecode-only architectures
+Patch3:         virt-top-1.1.1-ocaml-bytecode.patch
+
 BuildRequires:  gcc
 BuildRequires:  make
 BuildRequires:  ocaml >= 3.10.2
@@ -65,9 +67,15 @@ different virtualization systems.
 %setup -q
 
 %if 0%{?rhel} >= 6
-%patch1 -p1
+%patch -P1 -p1
 %endif
-%patch2 -p1
+%patch -P2 -p1
+%ifnarch %{ocaml_native_compiler}
+%patch -P3 -p1
+%endif
+
+# "ocamlfind byte" has been removed as an alias
+sed -i 's/\(OCAMLBEST=\)byte/\1ocamlc/' configure
 
 
 %build
@@ -106,7 +114,8 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %files -f %{name}.lang
-%doc COPYING README TODO
+%doc README TODO
+%license COPYING
 %{_bindir}/virt-top
 %{_mandir}/man1/virt-top.1*
 %if 0%{?rhel} >= 6
@@ -116,6 +125,12 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From 13160cd79560fa55845cbcb005df99325a163659 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 11 Jul 2023 11:36:26 +0100
Subject: [PATCH 20/40] ExcludeArch i686
 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SPML7CUBSZNI36NLXGVHEG7DNHU3EWOJ/)

---
 virt-top.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/virt-top.spec b/virt-top.spec
index 4d8f617..cbc28aa 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -1,3 +1,6 @@
+# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
+ExcludeArch: %{ix86}
+
 Name:           virt-top
 Version:        1.1.1
 Release:        11%{?dist}

From cc0771474e0abf85855a6cb2a567b2f1fd07309c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 12 Jul 2023 00:40:01 +0100
Subject: [PATCH 21/40] OCaml 5.0 rebuild for Fedora 39

---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index cbc28aa..424d662 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:           virt-top
 Version:        1.1.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPL-2.0-or-later
 
@@ -128,6 +128,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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

From b3038178961c557347ba9956ee395e20617772c6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jul 2023 17:44:47 +0000
Subject: [PATCH 22/40] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index 424d662..e0f86b6 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:           virt-top
 Version:        1.1.1
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPL-2.0-or-later
 
@@ -128,6 +128,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From 4e8b6c0e45fc355ca86ab8dece28a023aecd93df Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 5 Oct 2023 16:34:42 +0100
Subject: [PATCH 23/40] OCaml 5.1 rebuild for Fedora 40

---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index e0f86b6..dc87f61 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:           virt-top
 Version:        1.1.1
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPL-2.0-or-later
 
@@ -128,6 +128,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From 3b9599d9b004d30f3d6b6581fd5eaa33dcec7f77 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 27 Nov 2023 14:17:56 +0000
Subject: [PATCH 24/40] Fix build issue with libxml2 2.12.1

---
 ...-explicitly-disconnect-from-libvirtd.patch |  4 +-
 ...top-fix-to-parse-init-file-correctly.patch | 38 +++++++++++++++++++
 0003-src-Include-libxml-parser.h.patch        | 33 ++++++++++++++++
 virt-top.spec                                 | 17 +++++++--
 4 files changed, 87 insertions(+), 5 deletions(-)
 create mode 100644 0002-virt-top-fix-to-parse-init-file-correctly.patch
 create mode 100644 0003-src-Include-libxml-parser.h.patch

diff --git a/0001-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch b/0001-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch
index 330091f..fd607d3 100644
--- a/0001-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch
+++ b/0001-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch
@@ -1,7 +1,7 @@
 From 4b15ee2440b0e70e3c1eb5e164ded493e2d8f0c8 Mon Sep 17 00:00:00 2001
 From: Yuya Higashi <higashi.yuya@fujitsu.com>
 Date: Tue, 15 Nov 2022 13:56:21 +0900
-Subject: [PATCH] virt-top: fix to explicitly disconnect from libvirtd
+Subject: [PATCH 1/3] virt-top: fix to explicitly disconnect from libvirtd
 
 To prevent libvirtd from printing virNetSocketReadWire I/O errors when
 the virt-top command exits, explicitly disconnect from libvirtd.
@@ -35,5 +35,5 @@ index 75fbcb9..cbe655a 100644
  and get_key_press setup delay =
    (* Read the next key, waiting up to 'delay' milliseconds. *)
 -- 
-2.31.1
+2.42.0
 
diff --git a/0002-virt-top-fix-to-parse-init-file-correctly.patch b/0002-virt-top-fix-to-parse-init-file-correctly.patch
new file mode 100644
index 0000000..8129f51
--- /dev/null
+++ b/0002-virt-top-fix-to-parse-init-file-correctly.patch
@@ -0,0 +1,38 @@
+From 1d04fdfce6edea685596fbb18920799c70f1d7fa Mon Sep 17 00:00:00 2001
+From: Yuya Higashi <higashi.yuya@fujitsu.com>
+Date: Mon, 26 Dec 2022 09:18:15 +0900
+Subject: [PATCH 2/3] virt-top: fix to parse init-file correctly
+
+This fixes the following runtime error when parsing init-file.
+
+$ virt-top --init-file <(echo "sort id")
+Error: Invalid_argument("String.sub / Bytes.sub")
+Raised at Stdlib.invalid_arg in file "stdlib.ml", line 30, characters 20-45
+Called from Stdlib__String.sub in file "string.ml" (inlined), line 50, characters 2-23
+Called from Utils.split in file "utils.ml", line 82, characters 24-68
+Called from Utils.read_config_file.(fun) in file "utils.ml", line 114, characters 23-37
+Called from Stdlib__List.map in file "list.ml", line 92, characters 20-23
+Called from Top.start_up.try_to_read_init_file in file "top.ml", line 153, characters 17-42
+Called from Main.script_mode in file "main.ml", line 37, characters 6-17
+
+Signed-off-by: Yuya Higashi <higashi.yuya@fujitsu.com>
+---
+ src/utils.ml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/utils.ml b/src/utils.ml
+index 1f00803..8dfb255 100644
+--- a/src/utils.ml
++++ b/src/utils.ml
+@@ -79,7 +79,7 @@ let trim ?(test = isspace) str =
+ let split str sep =
+   try
+     let i = String.index str sep in
+-    String.sub str 0 i, String.sub str (i+1) (String.length str - 1)
++    String.sub str 0 i, String.sub str (i+1) (String.length str - i - 1)
+   with
+     Not_found -> str, ""
+ 
+-- 
+2.42.0
+
diff --git a/0003-src-Include-libxml-parser.h.patch b/0003-src-Include-libxml-parser.h.patch
new file mode 100644
index 0000000..a7d1537
--- /dev/null
+++ b/0003-src-Include-libxml-parser.h.patch
@@ -0,0 +1,33 @@
+From dd205eeae9fb06ac113884e4c9e9f3a90eef7554 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Mon, 27 Nov 2023 14:09:04 +0000
+Subject: [PATCH 3/3] src: Include <libxml/parser.h>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+libxml2 2.12.1 failed with this error:
+
+xml-c.c:92:9: warning: implicit declaration of function ‘xmlReadMemory’; did you mean ‘xmlInitMemory’? [-Wimplicit-function-declaration]
+   92 |   doc = xmlReadMemory (String_val (xmlv), caml_string_length (xmlv),
+      |         ^~~~~~~~~~~~~
+      |         xmlInitMemory
+---
+ src/xml-c.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/xml-c.c b/src/xml-c.c
+index 72042bf..6c546b9 100644
+--- a/src/xml-c.c
++++ b/src/xml-c.c
+@@ -28,6 +28,7 @@
+ #include <caml/memory.h>
+ #include <caml/mlvalues.h>
+ 
++#include <libxml/parser.h>
+ #include <libxml/xpath.h>
+ #include <libxml/xpathInternals.h>
+ 
+-- 
+2.42.0
+
diff --git a/virt-top.spec b/virt-top.spec
index dc87f61..f188b5e 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:           virt-top
 Version:        1.1.1
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPL-2.0-or-later
 
@@ -30,8 +30,14 @@ Patch1:         virt-top-1.0.9-processcsv-documentation.patch
 # Fix "Input/output error" in journal (RHBZ#2148798)
 Patch2:         0001-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch
 
+# Fix problem parsing init-file.
+Patch3:         0002-virt-top-fix-to-parse-init-file-correctly.patch
+
+# Fix libxml2 2.12.1 build problems.
+Patch4:         0003-src-Include-libxml-parser.h.patch
+
 # Fix linking problems on bytecode-only architectures
-Patch3:         virt-top-1.1.1-ocaml-bytecode.patch
+Patch5:         virt-top-1.1.1-ocaml-bytecode.patch
 
 BuildRequires:  gcc
 BuildRequires:  make
@@ -73,8 +79,10 @@ different virtualization systems.
 %patch -P1 -p1
 %endif
 %patch -P2 -p1
-%ifnarch %{ocaml_native_compiler}
 %patch -P3 -p1
+%patch -P4 -p1
+%ifnarch %{ocaml_native_compiler}
+%patch -P5 -p1
 %endif
 
 # "ocamlfind byte" has been removed as an alias
@@ -128,6 +136,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From b6f608c2ddd9bc5bf2bc64900a93d6794b618fcb Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 12 Dec 2023 15:11:37 +0000
Subject: [PATCH 25/40] OCaml 5.1.1 rebuild for Fedora 40

---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index f188b5e..5bebf0d 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:           virt-top
 Version:        1.1.1
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPL-2.0-or-later
 
@@ -136,6 +136,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From d69db7ac007c17269a1fc5061ee64aa5965455c8 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 18 Dec 2023 15:34:13 +0000
Subject: [PATCH 26/40] OCaml 5.1.1 + s390x code gen fix for Fedora 40

---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index 5bebf0d..2be5b14 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:           virt-top
 Version:        1.1.1
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPL-2.0-or-later
 
@@ -136,6 +136,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From 529d23a42539f51846c9cec2e7e3d9af43b70cc2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jan 2024 07:57:46 +0000
Subject: [PATCH 27/40] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index 2be5b14..00d7710 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:           virt-top
 Version:        1.1.1
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPL-2.0-or-later
 
@@ -136,6 +136,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From 7be3bf590ea17822c41d69f9f083d6120f58b939 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 30 May 2024 09:06:45 +0100
Subject: [PATCH 28/40] OCaml 5.2.0 for Fedora 41

---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index 00d7710..e744fa5 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:           virt-top
 Version:        1.1.1
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPL-2.0-or-later
 
@@ -136,6 +136,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From fbd272eaedd5a8d13322e6a71cb117125167b852 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 19 Jun 2024 16:57:33 +0100
Subject: [PATCH 29/40] OCaml 5.2.0 ppc64le fix

---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index e744fa5..51172e6 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:           virt-top
 Version:        1.1.1
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPL-2.0-or-later
 
@@ -136,6 +136,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From b3c021903b9f2cb386d49c7317c609bbfefcb884 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 20 Jul 2024 08:52:58 +0000
Subject: [PATCH 30/40] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index 51172e6..48c26f2 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:           virt-top
 Version:        1.1.1
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPL-2.0-or-later
 
@@ -136,6 +136,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From 7503fd9d5d8c24f9c659e98d73577b65c7ba31e4 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Fri, 10 Jan 2025 14:39:34 -0700
Subject: [PATCH 31/40] OCaml 5.3.0 rebuild for Fedora 42

---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index 48c26f2..c8c6f91 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:           virt-top
 Version:        1.1.1
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPL-2.0-or-later
 
@@ -136,6 +136,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From b592237ea6e6ab31c536ee6994cfa1be55864ffb Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 19 Jan 2025 14:28:10 +0000
Subject: [PATCH 32/40] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index c8c6f91..8dbf52d 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:           virt-top
 Version:        1.1.1
-Release:        22%{?dist}
+Release:        23%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPL-2.0-or-later
 
@@ -136,6 +136,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From 5c32f27eb0d2937281467c1ba97afd4fcddb3eeb Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 27 Feb 2025 09:37:13 +0000
Subject: [PATCH 33/40] Bump and rebuild for ocaml-gettext 0.5.0

---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index 8dbf52d..9b8b612 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:           virt-top
 Version:        1.1.1
-Release:        23%{?dist}
+Release:        24%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPL-2.0-or-later
 
@@ -136,6 +136,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* Thu Feb 27 2025 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-24
+- Bump and rebuild for ocaml-gettext 0.5.0
+
 * Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From 2db015db276f05056a68f6e922896c0c4d028dfe Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 27 Feb 2025 18:37:16 +0000
Subject: [PATCH 34/40] New upstream version 1.1.2 Disable gettext support in
 Fedora Rawhide

---
 ...-explicitly-disconnect-from-libvirtd.patch | 39 -------------------
 ...top-fix-to-parse-init-file-correctly.patch | 38 ------------------
 0003-src-Include-libxml-parser.h.patch        | 33 ----------------
 sources                                       |  4 +-
 virt-top-1.1.1-ocaml-bytecode.patch           | 28 -------------
 virt-top.spec                                 | 25 +++++-------
 6 files changed, 11 insertions(+), 156 deletions(-)
 delete mode 100644 0001-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch
 delete mode 100644 0002-virt-top-fix-to-parse-init-file-correctly.patch
 delete mode 100644 0003-src-Include-libxml-parser.h.patch
 delete mode 100644 virt-top-1.1.1-ocaml-bytecode.patch

diff --git a/0001-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch b/0001-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch
deleted file mode 100644
index fd607d3..0000000
--- a/0001-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4b15ee2440b0e70e3c1eb5e164ded493e2d8f0c8 Mon Sep 17 00:00:00 2001
-From: Yuya Higashi <higashi.yuya@fujitsu.com>
-Date: Tue, 15 Nov 2022 13:56:21 +0900
-Subject: [PATCH 1/3] virt-top: fix to explicitly disconnect from libvirtd
-
-To prevent libvirtd from printing virNetSocketReadWire I/O errors when
-the virt-top command exits, explicitly disconnect from libvirtd.
-
-Signed-off-by: Yuya Higashi <higashi.yuya@fujitsu.com>
----
- src/top.ml | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/top.ml b/src/top.ml
-index 75fbcb9..cbe655a 100644
---- a/src/top.ml
-+++ b/src/top.ml
-@@ -306,7 +306,7 @@ let get_string maxlen =
-   )
- 
- (* Main loop. *)
--let rec main_loop ((_, batch_mode, script_mode, csv_enabled, stream_mode, _, _, _)
-+let rec main_loop ((conn, batch_mode, script_mode, csv_enabled, stream_mode, _, _, _)
- 		     as setup) =
-   let csv_flags = !csv_cpu, !csv_mem, !csv_block, !csv_net in
- 
-@@ -372,7 +372,8 @@ let rec main_loop ((_, batch_mode, script_mode, csv_enabled, stream_mode, _, _,
-       if not !quit || !end_time <> None then
- 	millisleep delay
-     )
--  done
-+  done;
-+  C.close conn
- 
- and get_key_press setup delay =
-   (* Read the next key, waiting up to 'delay' milliseconds. *)
--- 
-2.42.0
-
diff --git a/0002-virt-top-fix-to-parse-init-file-correctly.patch b/0002-virt-top-fix-to-parse-init-file-correctly.patch
deleted file mode 100644
index 8129f51..0000000
--- a/0002-virt-top-fix-to-parse-init-file-correctly.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1d04fdfce6edea685596fbb18920799c70f1d7fa Mon Sep 17 00:00:00 2001
-From: Yuya Higashi <higashi.yuya@fujitsu.com>
-Date: Mon, 26 Dec 2022 09:18:15 +0900
-Subject: [PATCH 2/3] virt-top: fix to parse init-file correctly
-
-This fixes the following runtime error when parsing init-file.
-
-$ virt-top --init-file <(echo "sort id")
-Error: Invalid_argument("String.sub / Bytes.sub")
-Raised at Stdlib.invalid_arg in file "stdlib.ml", line 30, characters 20-45
-Called from Stdlib__String.sub in file "string.ml" (inlined), line 50, characters 2-23
-Called from Utils.split in file "utils.ml", line 82, characters 24-68
-Called from Utils.read_config_file.(fun) in file "utils.ml", line 114, characters 23-37
-Called from Stdlib__List.map in file "list.ml", line 92, characters 20-23
-Called from Top.start_up.try_to_read_init_file in file "top.ml", line 153, characters 17-42
-Called from Main.script_mode in file "main.ml", line 37, characters 6-17
-
-Signed-off-by: Yuya Higashi <higashi.yuya@fujitsu.com>
----
- src/utils.ml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/utils.ml b/src/utils.ml
-index 1f00803..8dfb255 100644
---- a/src/utils.ml
-+++ b/src/utils.ml
-@@ -79,7 +79,7 @@ let trim ?(test = isspace) str =
- let split str sep =
-   try
-     let i = String.index str sep in
--    String.sub str 0 i, String.sub str (i+1) (String.length str - 1)
-+    String.sub str 0 i, String.sub str (i+1) (String.length str - i - 1)
-   with
-     Not_found -> str, ""
- 
--- 
-2.42.0
-
diff --git a/0003-src-Include-libxml-parser.h.patch b/0003-src-Include-libxml-parser.h.patch
deleted file mode 100644
index a7d1537..0000000
--- a/0003-src-Include-libxml-parser.h.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From dd205eeae9fb06ac113884e4c9e9f3a90eef7554 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Mon, 27 Nov 2023 14:09:04 +0000
-Subject: [PATCH 3/3] src: Include <libxml/parser.h>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-libxml2 2.12.1 failed with this error:
-
-xml-c.c:92:9: warning: implicit declaration of function ‘xmlReadMemory’; did you mean ‘xmlInitMemory’? [-Wimplicit-function-declaration]
-   92 |   doc = xmlReadMemory (String_val (xmlv), caml_string_length (xmlv),
-      |         ^~~~~~~~~~~~~
-      |         xmlInitMemory
----
- src/xml-c.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/xml-c.c b/src/xml-c.c
-index 72042bf..6c546b9 100644
---- a/src/xml-c.c
-+++ b/src/xml-c.c
-@@ -28,6 +28,7 @@
- #include <caml/memory.h>
- #include <caml/mlvalues.h>
- 
-+#include <libxml/parser.h>
- #include <libxml/xpath.h>
- #include <libxml/xpathInternals.h>
- 
--- 
-2.42.0
-
diff --git a/sources b/sources
index 982081e..ddae418 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-top-1.1.1.tar.gz) = 4f4c7338f1ce1f82b1a9287c256da4b60d7b2e5163ea4b19eb0257c104303dcecf28177f8034e34d255fec462adc19ab61e6a4b9db857da02f2cdf2b1c818093
-SHA512 (virt-top-1.1.1.tar.gz.sig) = 6236b7a68492663d743f1ee2e50ea91adafab97654c333d2b92f66a0c7a9cd5d6748fe2467f29db80c65428d804624a42d64f3ee7d0d09f612e95effec0e395e
+SHA512 (virt-top-1.1.2.tar.gz) = 1dd495daf106601236680b6d028262a217b8b93edb51c3f6c148fef7b452d8d188f1df18d500338377d9becff2174a6e33ccda4eaa913e7a159820d7bfca3a3c
+SHA512 (virt-top-1.1.2.tar.gz.sig) = db754791923aa30838b5f33bd6a523fda4a34068e9b20cdedc09e56a72de7e894f156e70106c5274f9e8121dde25cfc594e9fcb932dca08af15fe67e0c27990a
diff --git a/virt-top-1.1.1-ocaml-bytecode.patch b/virt-top-1.1.1-ocaml-bytecode.patch
deleted file mode 100644
index d156272..0000000
--- a/virt-top-1.1.1-ocaml-bytecode.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- virt-top-1.1.1/configure.orig	2021-11-03 14:18:26.000000000 -0600
-+++ virt-top-1.1.1/configure	2023-07-10 12:31:15.525435684 -0600
-@@ -5357,7 +5357,7 @@ else
-   OCAMLOPT="$ac_cv_prog_OCAMLOPT"
- fi
- 
--     OCAMLBEST=byte
-+     OCAMLBEST=ocamlc
-      if test "$OCAMLOPT" = "no"; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find ocamlopt; bytecode compilation only." >&5
- $as_echo "$as_me: WARNING: Cannot find ocamlopt; bytecode compilation only." >&2;}
---- virt-top-1.1.1/ocaml-link.sh.in.orig	2021-11-03 06:00:07.000000000 -0600
-+++ virt-top-1.1.1/ocaml-link.sh.in	2023-07-10 12:31:41.012064849 -0600
-@@ -49,10 +49,12 @@ if [ x"${V:-@AM_DEFAULT_VERBOSITY@}" = x
-   echo "$@" \
-      @OCAML_RUNTIME_VARIANT_PIC_OPTION@ \
-      -linkpkg \
--     -cclib "'@LDFLAGS@ $cclib'"
-+     -cclib "'@LDFLAGS@ $cclib'" \
-+     -output-complete-exe
- fi
- # NB -cclib must come last.
- exec "$@" \
-      @OCAML_RUNTIME_VARIANT_PIC_OPTION@ \
-      -linkpkg \
--     -cclib "@LDFLAGS@ $cclib"
-+     -cclib "@LDFLAGS@ $cclib" \
-+     -output-complete-exe
diff --git a/virt-top.spec b/virt-top.spec
index 9b8b612..1a02cfc 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -2,8 +2,8 @@
 ExcludeArch: %{ix86}
 
 Name:           virt-top
-Version:        1.1.1
-Release:        24%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPL-2.0-or-later
 
@@ -27,18 +27,6 @@ Source4:        libguestfs.keyring
 # included in RHEL builds.
 Patch1:         virt-top-1.0.9-processcsv-documentation.patch
 
-# Fix "Input/output error" in journal (RHBZ#2148798)
-Patch2:         0001-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch
-
-# Fix problem parsing init-file.
-Patch3:         0002-virt-top-fix-to-parse-init-file-correctly.patch
-
-# Fix libxml2 2.12.1 build problems.
-Patch4:         0003-src-Include-libxml-parser.h.patch
-
-# Fix linking problems on bytecode-only architectures
-Patch5:         virt-top-1.1.1-ocaml-bytecode.patch
-
 BuildRequires:  gcc
 BuildRequires:  make
 BuildRequires:  ocaml >= 3.10.2
@@ -48,7 +36,11 @@ BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-curses-devel >= 1.0.3-7
 BuildRequires:  ocaml-calendar-devel
 BuildRequires:  ocaml-libvirt-devel >= 0.6.1.5
+%if 0%{?fedora} <= 42
+# Disable ocaml-gettext-devel in Rawhide temporarily.
+# https://src.fedoraproject.org/rpms/ocaml-gettext/pull-request/3
 BuildRequires:  ocaml-gettext-devel >= 0.3.3
+%endif
 BuildRequires:  ocaml-fileutils-devel
 # For msgfmt:
 BuildRequires:  gettext
@@ -136,8 +128,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
-* Thu Feb 27 2025 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-24
-- Bump and rebuild for ocaml-gettext 0.5.0
+* 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

From 7f256431dc03c256aadcbe7332a2050052888f3c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 28 Feb 2025 11:56:26 +0000
Subject: [PATCH 35/40] Remove unused patch lines

Fixes: commit 2db015db276f05056a68f6e922896c0c4d028dfe
---
 virt-top.spec | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/virt-top.spec b/virt-top.spec
index 1a02cfc..f987899 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -70,12 +70,6 @@ different virtualization systems.
 %if 0%{?rhel} >= 6
 %patch -P1 -p1
 %endif
-%patch -P2 -p1
-%patch -P3 -p1
-%patch -P4 -p1
-%ifnarch %{ocaml_native_compiler}
-%patch -P5 -p1
-%endif
 
 # "ocamlfind byte" has been removed as an alias
 sed -i 's/\(OCAMLBEST=\)byte/\1ocamlc/' configure

From a01d2f0db344f18b305dbec1de7db8ed04cd399c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 3 Apr 2025 09:47:56 +0100
Subject: [PATCH 36/40] Enable ocaml-gettext again

---
 virt-top.spec | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/virt-top.spec b/virt-top.spec
index f987899..04a2528 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:           virt-top
 Version:        1.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPL-2.0-or-later
 
@@ -36,11 +36,7 @@ BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-curses-devel >= 1.0.3-7
 BuildRequires:  ocaml-calendar-devel
 BuildRequires:  ocaml-libvirt-devel >= 0.6.1.5
-%if 0%{?fedora} <= 42
-# Disable ocaml-gettext-devel in Rawhide temporarily.
-# https://src.fedoraproject.org/rpms/ocaml-gettext/pull-request/3
 BuildRequires:  ocaml-gettext-devel >= 0.3.3
-%endif
 BuildRequires:  ocaml-fileutils-devel
 # For msgfmt:
 BuildRequires:  gettext
@@ -122,6 +118,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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

From 9408e4cecd4f38227698b13f8e418a1b79f936ae Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Sat, 12 Jul 2025 16:37:42 -0600
Subject: [PATCH 37/40] Rebuild to fix OCaml dependencies

- Change http URLs to https
---
 virt-top.spec | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/virt-top.spec b/virt-top.spec
index 04a2528..1ab03a4 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:           virt-top
 Version:        1.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPL-2.0-or-later
 
@@ -12,9 +12,9 @@ License:        GPL-2.0-or-later
 ExcludeArch:    %{power64}
 %endif
 
-URL:            http://people.redhat.com/~rjones/virt-top/
-Source0:        http://people.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz
-Source1:        http://people.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz.sig
+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).
 Source2:        processcsv.py
@@ -118,6 +118,10 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From 4fde25577d40e439d3d7d5c63d780a5f7f089115 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 20:08:59 +0000
Subject: [PATCH 38/40] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index 1ab03a4..c7d9969 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:           virt-top
 Version:        1.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPL-2.0-or-later
 
@@ -118,6 +118,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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

From 8a797311d93cfe339872737ebe6643681c39f416 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 14 Oct 2025 20:53:52 +0100
Subject: [PATCH 39/40] OCaml 5.4.0 rebuild

---
 virt-top.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index c7d9969..071a5a3 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
 
 Name:           virt-top
 Version:        1.1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPL-2.0-or-later
 
@@ -118,6 +118,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* 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
 

From c72a1f45b73411f1da5150136cc9e24697948b8a Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Tue, 13 Jan 2026 20:55:21 -0700
Subject: [PATCH 40/40] Fix a changelog entry

---
 virt-top.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/virt-top.spec b/virt-top.spec
index 071a5a3..224d6d7 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -124,7 +124,7 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 * 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
+* Mon Jul 07 2025 Jerry James <loganjerry@gmail.com> - 1.1.2-3
 - Rebuild to fix OCaml dependencies
 - Change http URLs to https