From 7503fd9d5d8c24f9c659e98d73577b65c7ba31e4 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 10 Jan 2025 14:39:34 -0700 Subject: [PATCH 01/12] 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 - 1.1.1-22 +- OCaml 5.3.0 rebuild for Fedora 42 + * Sat Jul 20 2024 Fedora Release Engineering - 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 Date: Sun, 19 Jan 2025 14:28:10 +0000 Subject: [PATCH 02/12] 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 - 1.1.1-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jan 10 2025 Jerry James - 1.1.1-22 - OCaml 5.3.0 rebuild for Fedora 42 From 46b85c4bcd66434244c3822f0ffccbc5755cfe7b Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 29 Jan 2025 14:52:28 -0700 Subject: [PATCH 03/12] OCaml 5.2.1 rebuild 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 48c26f2..0ffbe28 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 +* Wed Jan 29 2025 Jerry James - 1.1.1-22 +- OCaml 5.2.1 rebuild for Fedora 41 + * Sat Jul 20 2024 Fedora Release Engineering - 1.1.1-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 5c32f27eb0d2937281467c1ba97afd4fcddb3eeb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 27 Feb 2025 09:37:13 +0000 Subject: [PATCH 04/12] 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 - 1.1.1-24 +- Bump and rebuild for ocaml-gettext 0.5.0 + * Sun Jan 19 2025 Fedora Release Engineering - 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" Date: Thu, 27 Feb 2025 18:37:16 +0000 Subject: [PATCH 05/12] 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 -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 ---- - 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 -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 ---- - 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" -Date: Mon, 27 Nov 2023 14:09:04 +0000 -Subject: [PATCH 3/3] src: Include -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 - #include - -+#include - #include - #include - --- -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 - 1.1.1-24 -- Bump and rebuild for ocaml-gettext 0.5.0 +* Fri Feb 28 2025 Richard W.M. Jones - 1.1.2-1 +- New upstream version 1.1.2 +- Disable gettext support in Fedora Rawhide * Sun Jan 19 2025 Fedora Release Engineering - 1.1.1-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 48b558765e9802f89e734b71fc425c128d17c821 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 27 Feb 2025 18:37:16 +0000 Subject: [PATCH 06/12] New upstream version 1.1.2 Disable gettext support in Fedora Rawhide (cherry picked from commit 2db015db276f05056a68f6e922896c0c4d028dfe) --- ...-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 | 24 +++++------- 6 files changed, 12 insertions(+), 154 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 -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 ---- - 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 -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 ---- - 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" -Date: Mon, 27 Nov 2023 14:09:04 +0000 -Subject: [PATCH 3/3] src: Include -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 - #include - -+#include - #include - #include - --- -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 0ffbe28..fe682c6 100644 --- a/virt-top.spec +++ b/virt-top.spec @@ -2,8 +2,8 @@ ExcludeArch: %{ix86} Name: virt-top -Version: 1.1.1 -Release: 22%{?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,6 +128,10 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/ %changelog +* Fri Feb 28 2025 Richard W.M. Jones - 1.1.2-1 +- New upstream version 1.1.2 +- Disable gettext support in Fedora Rawhide + * Wed Jan 29 2025 Jerry James - 1.1.1-22 - OCaml 5.2.1 rebuild for Fedora 41 From 7f256431dc03c256aadcbe7332a2050052888f3c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 28 Feb 2025 11:56:26 +0000 Subject: [PATCH 07/12] 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" Date: Thu, 3 Apr 2025 09:47:56 +0100 Subject: [PATCH 08/12] 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 - 1.1.2-2 +- Enable ocaml-gettext again + * Fri Feb 28 2025 Richard W.M. Jones - 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 Date: Sat, 12 Jul 2025 16:37:42 -0600 Subject: [PATCH 09/12] 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 - 1.1.2-3 +- Rebuild to fix OCaml dependencies +- Change http URLs to https + * Thu Apr 03 2025 Richard W.M. Jones - 1.1.2-2 - Enable ocaml-gettext again From 4fde25577d40e439d3d7d5c63d780a5f7f089115 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:08:59 +0000 Subject: [PATCH 10/12] 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 - 1.1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jul 07 2025 Jerry James - 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" Date: Tue, 14 Oct 2025 20:53:52 +0100 Subject: [PATCH 11/12] 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 - 1.1.2-5 +- OCaml 5.4.0 rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 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 Date: Tue, 13 Jan 2026 20:55:21 -0700 Subject: [PATCH 12/12] 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 - 1.1.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild -* Mon Jul 07 2025 Jerry James - 1.1.2-3 +* Mon Jul 07 2025 Jerry James - 1.1.2-3 - Rebuild to fix OCaml dependencies - Change http URLs to https