From b52ac3e21652cf0731d7c78c388ba643f7e6265f Mon Sep 17 00:00:00 2001 From: Richard W.M. Jones Date: May 05 2020 11:04:37 +0000 Subject: Fix broken documentation patch (RHEL/ELN only). --- diff --git a/virt-top-1.0.4-processcsv-documentation.patch b/virt-top-1.0.4-processcsv-documentation.patch deleted file mode 100644 index 010e880..0000000 --- a/virt-top-1.0.4-processcsv-documentation.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- virt-top-1.0.4.old/virt-top/virt-top.pod 2011-08-11 14:30:30.560493914 +0100 -+++ virt-top-1.0.4/virt-top/virt-top.pod 2011-08-11 14:34:00.934495607 +0100 -@@ -123,6 +123,22 @@ - - virt-top --csv >(split -d -l 1000 - output.csv.) - -+RHEL provides a short Python script called C which -+can be used to post-process the CSV output. Run it like this: -+ -+ virt-top --csv data.csv -+ processcsv.py < data.csv -+ -+This creates or I the following files in the current -+directory: -+ -+ global.csv -+ domain.csv -+ -+C will contain the global data. One -+CNNNE.csv> file will also be created for each domain -+with ID C, containing the per-domain data. -+ - =item B<--no-csv-cpu> - - Disable domain CPU stats in CSV output. diff --git a/virt-top-1.0.9-processcsv-documentation.patch b/virt-top-1.0.9-processcsv-documentation.patch new file mode 100644 index 0000000..fcaf6ff --- /dev/null +++ b/virt-top-1.0.9-processcsv-documentation.patch @@ -0,0 +1,26 @@ +diff -ur virt-top-1.0.9.old/src/virt-top.pod virt-top-1.0.9.new/src/virt-top.pod +--- virt-top-1.0.9.old/src/virt-top.pod 2020-05-05 12:01:25.069799212 +0100 ++++ virt-top-1.0.9.new/src/virt-top.pod 2020-05-05 12:02:05.234337666 +0100 +@@ -129,6 +129,22 @@ + + virt-top --csv >(split -d -l 1000 - output.csv.) + ++RHEL provides a short Python script called C which ++can be used to post-process the CSV output. Run it like this: ++ ++ virt-top --csv data.csv ++ processcsv.py < data.csv ++ ++This creates or I the following files in the current ++directory: ++ ++ global.csv ++ domain.csv ++ ++C will contain the global data. One ++CNNNE.csv> file will also be created for each domain ++with ID C, containing the per-domain data. ++ + =item B<--no-csv-cpu> + + Disable domain CPU stats in CSV output. diff --git a/virt-top.spec b/virt-top.spec index 62e57b6..8bd43b8 100644 --- a/virt-top.spec +++ b/virt-top.spec @@ -3,7 +3,7 @@ Name: virt-top Version: 1.0.9 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Utility like top(1) for displaying virtualization stats License: GPLv2+ @@ -14,7 +14,9 @@ Source0: http://people.redhat.com/~rjones/virt-top/files/%{name}-%{versio Source1: processcsv.py Source2: processcsv.py.pod -Patch0: virt-top-1.0.4-processcsv-documentation.patch +# 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 # Upstream patch to fix FTBFS with ocaml libvirt 0.6.1.5. Patch1: 0001-libvirt-Handle-VIR_DOMAIN_PMSUSPENDED-state.patch @@ -116,6 +118,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/ %changelog +* Tue May 5 2020 Richard W.M. Jones - 1.0.9-11 +- Fix broken documentation patch (RHEL/ELN only). + * Wed Apr 22 2020 Richard W.M. Jones - 1.0.9-10 - OCaml 4.11.0 pre-release attempt 2