13 changed files with 91 additions and 552 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -0,0 +1 @@
+virt-top-1.0.4.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +0,0 @@
-*~
-
-/.build*.log
-/clog
-/virt-top-*.tar.gz
-/virt-top-*.tar.gz.sig
--- a/21
+++ b/21
@ -0,0 +1,21 @@
+# Makefile for source rpm: virt-top
+# $Id: Makefile,v 1.1 2008/05/20 02:36:53 kevin Exp $
+NAME := virt-top
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)
--- a/libguestfs.keyring
+++ b/libguestfs.keyring
--- a/processcsv.py
+++ b/processcsv.py
@ -1,65 +0,0 @@
-#!/usr/bin/python3
-#
-# https://bugzilla.redhat.com/show_bug.cgi?id=665817
-#
-# Usage:
-#
-#   virt-top --csv data.csv
-#   processcsv.py < data.csv
-#
-# Note this OVERWRITES the following files in the current directory:
-#
-#   global.csv         # all the global data
-#   domain<NN>.csv     # data for domain ID <NN> (multiple files)
-
-import sys
-import csv
-
-rows = csv.reader (sys.stdin)
-
-# Get the header row.
-header = next(rows)
-
-# Find the index of the 'Hostname' and 'Time' cols (usually first two).
-hostname_i = header.index ("Hostname")
-time_i = header.index ("Time")
-
-# Find the index of the 'Domain ID' column (i) and the number of
-# columns per domain (w).
-i = header.index ("Domain ID")
-w = len (header) - i
-
-dom_header = header[i:i+w]
-dom_header.insert (0, "Hostname")
-dom_header.insert (1, "Time")
-
-gfile = open ("global.csv", "w")
-gfile_writer = csv.writer (gfile)
-gfile_writer.writerow (header[0:i])
-
-dfiles = dict()
-
-# Process all the remaining data rows.
-for data in rows:
-    # Global data is columns 0..i-1
-    gfile_writer.writerow (data[0:i])
-
-    hostname = data[hostname_i]
-    time = data[time_i]
-
-    # For each domain ...
-    for j in range(i,len(data),w):
-        dom = data[j:j+w]
-        domid = dom[0]
-
-        if domid in dfiles:
-            dfile_writer = dfiles[domid]
-        else:
-            dfile = open ("domain%s.csv" % domid, "w")
-            dfile_writer = csv.writer (dfile)
-            dfile_writer.writerow (dom_header)
-            dfiles[domid] = dfile_writer
-
-        dom.insert (0, hostname)
-        dom.insert (1, time)
-        dfile_writer.writerow (dom)
--- a/processcsv.py.pod
+++ b/processcsv.py.pod
@ -1,64 +0,0 @@
-=head1 NAME
-
-processcsv.py - process virt-top CSV files
-
-=head1 SUMMARY
-
- virt-top --csv data.csv
- processcsv.py < data.csv
-
-=head1 DESCRIPTION
-
-virt-top is a L<top(1)>-like utility for showing stats of virtualized
-domains.
-
-processcsv.py is a simple Python script that post-processes the output
-of C<virt-top --csv>.
-
-It is used like this:
-
- virt-top --csv data.csv
- processcsv.py < data.csv
-
-The second command will B<overwrite> the following files in the
-current directory:
-
-=over 4
-
-=item C<global.csv>
-
-This contains the global (host) statistics columns from the CSV file.
-
-=item C<domainI<NN>.csv> (multiple files)
-
-For each libvirt domain ID I<NN>, a file is created containing
-the per-domain statistics from the CSV file.
-
-=back
-
-=head1 SEE ALSO
-
-L<virt-top(1)>
-
-=head1 AUTHORS
-
-Richard W.M. Jones <rjones @ redhat . com>
-
-=head1 COPYRIGHT
-
-(C) Copyright 2007-2012 Red Hat Inc., Richard W.M. Jones
-http://libvirt.org/
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--- a/3
+++ b/3
@ -1,2 +1 @@
-SHA512 (virt-top-1.1.2.tar.gz) = 1dd495daf106601236680b6d028262a217b8b93edb51c3f6c148fef7b452d8d188f1df18d500338377d9becff2174a6e33ccda4eaa913e7a159820d7bfca3a3c
-SHA512 (virt-top-1.1.2.tar.gz.sig) = db754791923aa30838b5f33bd6a523fda4a34068e9b20cdedc09e56a72de7e894f156e70106c5274f9e8121dde25cfc594e9fcb932dca08af15fe67e0c27990a
+491929219b5b49b4e502a1643599be95  virt-top-1.0.4.tar.gz
--- a/tests/basic-test.sh
+++ b/tests/basic-test.sh
@ -1,11 +0,0 @@
-#!/bin/bash -
-set -e
-set -x
-
-# We need to start libvirtd, see:
-# https://bugzilla.redhat.com/show_bug.cgi?id=1682780#c8
-systemctl start libvirtd ||:
-
-# I'd like to use the test:/// driver but it doesn't support the right
-# APIs.
-virt-top --stream -d 1 -n 3 --debug /dev/stdout
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -1,13 +0,0 @@
- hosts: localhost
-  roles:
-  - role: standard-test-basic
-    tags:
-    - classic
-    required_packages:
-    - libvirt-daemon
-    - libvirt-daemon-kvm
-    - virt-top
-    tests:
-    - simple:
-        dir: .
-        run: ./basic-test.sh
--- a/virt-top-1.0.3-bogus-zh_CN-plurals.patch
+++ b/virt-top-1.0.3-bogus-zh_CN-plurals.patch
@ -0,0 +1,10 @@
+--- virt-top-1.0.3/po/zh_CN.po.orig	2008-10-21 10:51:15.000000000 +0100
+++ virt-top-1.0.3/po/zh_CN.po	2008-10-21 10:51:25.000000000 +0100
+@@ -14,7 +14,6 @@
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+ "X-Generator: KBabel 1.11.4\n"
+ 
+ #: ../virt-top/virt_top.ml:1492
--- a/virt-top-1.0.4-bogus-ja-plurals.patch
+++ b/virt-top-1.0.4-bogus-ja-plurals.patch
@ -0,0 +1,12 @@
+diff -ur virt-top-1.0.4.orig/po/ja.po virt-top-1.0.4/po/ja.po
+--- virt-top-1.0.4.orig/po/ja.po	2009-10-05 16:24:06.295900599 +0100
+++ virt-top-1.0.4/po/ja.po	2009-10-05 16:24:49.296650985 +0100
+@@ -10,7 +10,7 @@
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n\n"
+"Plural-Forms: nplurals=1; plural=0;\n\n"
+ "X-Generator: KBabel 1.11.4\n"
+ 
+ #: ../virt-top/virt_top.ml:1492
--- a/virt-top-1.0.9-processcsv-documentation.patch
+++ b/virt-top-1.0.9-processcsv-documentation.patch
@ -1,26 +0,0 @@
-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<processcsv.py> 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<overwrites> the following files in the current
-+directory:
-+
-+ global.csv
-+ domain<NNN>.csv
-+
-+C<global.csv> will contain the global data.  One
-+C<domainE<lt>NNNE<gt>.csv> file will also be created for each domain
-+with ID C<NNN>, containing the per-domain data.
-+
- =item B<--no-csv-cpu>
- 
- Disable domain CPU stats in CSV output.
--- a/virt-top.spec
+++ b/virt-top.spec
@ -1,53 +1,45 @@
-# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
-ExcludeArch: %{ix86}
+%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%define debug_package %{nil}

 Name:           virt-top
-Version:        1.1.2
-Release:        5%{?dist}
+Version:        1.0.4
+Release:        3%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
-License:        GPL-2.0-or-later

-%if 0%{?rhel}
-# No qemu-kvm on POWER (RHBZ#1946532).
-ExcludeArch:    %{power64}
-%endif
+Group:          Development/Libraries
+License:        GPLv2+
+URL:            http://et.redhat.com/~rjones/virt-top/
+Source0:        http://et.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x

-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
+Patch0:         virt-top-1.0.3-bogus-zh_CN-plurals.patch
+Patch1:         virt-top-1.0.4-bogus-ja-plurals.patch

-# Post-process output of CSV file (RHBZ#665817, RHBZ#912020).
-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.
-Patch1:         virt-top-1.0.9-processcsv-documentation.patch
-
-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
+BuildRequires:  ocaml-libvirt-devel
+
+# Tortuous list of BRs for gettext.
 BuildRequires:  ocaml-gettext-devel >= 0.3.3
 BuildRequires:  ocaml-fileutils-devel
+%ifnarch ppc64
+BuildRequires:  ocaml-camomile-data
+%endif
 # For msgfmt:
 BuildRequires:  gettext

 # Non-OCaml BRs.
 BuildRequires:  libvirt-devel
-BuildRequires:  libxml2-devel
-BuildRequires:  perl-interpreter
-BuildRequires:  perl(Pod::Perldoc)
+BuildRequires:  perl
 BuildRequires:  gawk
-BuildRequires:  gnupg2


 %description
@ -60,366 +52,55 @@ different virtualization systems.


 %prep
-%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %setup -q
-
-%if 0%{?rhel} >= 6
-%patch -P1 -p1
-%endif
-
-# "ocamlfind byte" has been removed as an alias
-sed -i 's/\(OCAMLBEST=\)byte/\1ocamlc/' configure
+%patch0 -p1
+%patch1 -p1
+chmod -x COPYING


 %build
 %configure
-make
+make all
+%if %opt
+make opt
+strip virt-top/virt-top.opt
+%endif
+
+# Build translations.
+make -C po

 # Force rebuild of man page.
-# There is a missing man_MANS rule, will fix upstream in next version.
-rm -f src/virt-top.1
-make -C src virt-top.1
-
-%if 0%{?rhel} >= 6
-# Build processcsv.py.1.
-pod2man -c "Virtualization Support" --release "%{name}-%{version}" \
-  %{SOURCE3} > processcsv.py.1
-%endif
+rm virt-top/virt-top.1
+make -C virt-top virt-top.1


 %install
+rm -rf $RPM_BUILD_ROOT
+
 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 - see above.
+# Install virt-top manpage by hand for now.
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 0644 src/virt-top.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -m 0644 virt-top/virt-top.1 $RPM_BUILD_ROOT%{_mandir}/man1

-%if 0%{?rhel} >= 6
-# Install processcsv.py.
-install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}

-# Install processcsv.py(1).
-install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-%endif
+%clean
+rm -rf $RPM_BUILD_ROOT


 %files -f %{name}.lang
-%doc README TODO
-%license COPYING
+%defattr(-,root,root,-)
+%doc COPYING README TODO.virt-top ChangeLog
 %{_bindir}/virt-top
 %{_mandir}/man1/virt-top.1*
-%if 0%{?rhel} >= 6
-%{_bindir}/processcsv.py
-%{_mandir}/man1/processcsv.py.1*
-%endif


 %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
-
-* Mon Jul 07 2025 Jerry James <loganjerry@gmail.com> - 1.1.2-3
- Rebuild to fix OCaml dependencies
- Change http URLs to https
-
-* Thu Apr 03 2025 Richard W.M. Jones <rjones@redhat.com> - 1.1.2-2
- Enable ocaml-gettext again
-
-* Fri Feb 28 2025 Richard W.M. Jones <rjones@redhat.com> - 1.1.2-1
- New upstream version 1.1.2
- Disable gettext support in Fedora Rawhide
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Fri Jan 10 2025 Jerry James <loganjerry@gmail.com> - 1.1.1-22
- OCaml 5.3.0 rebuild for Fedora 42
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Wed Jun 19 2024 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-20
- OCaml 5.2.0 ppc64le fix
-
-* Thu May 30 2024 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-19
- OCaml 5.2.0 for Fedora 41
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-17
- OCaml 5.1.1 + s390x code gen fix for Fedora 40
-
-* Tue Dec 12 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-16
- OCaml 5.1.1 rebuild for Fedora 40
-
-* Mon Nov 27 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-15
- Fix build issue with libxml2 2.12.1
-
-* Thu Oct 05 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-14
- OCaml 5.1 rebuild for Fedora 40
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jul 11 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-12
- OCaml 5.0 rebuild for Fedora 39
-
-* Mon Jul 10 2023 Jerry James <loganjerry@gmail.com> - 1.1.1-11
- OCaml 5.0.0 rebuild
- Add patch to fix linking on bytecode-only architectures
- Update deprecated %%patchN usage
- Use %%license macro
-
-* Mon Jun 05 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-10
- Migrated to SPDX license
-
-* Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-9
- Rebuild OCaml packages for F38
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Mon Nov 28 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-7
- Fix "Input/output error" in journal (RHBZ#2148798)
-
-* Tue Oct 18 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-6
- Check tarball signature
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sun Jun 19 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-4
- OCaml 4.14.0 rebuild
-
-* Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-3
- OCaml 4.13.1 rebuild to remove package notes
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Nov 03 2021 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-1
- New upstream development version 1.1.1
- No longer depends on ocaml-csv, ocaml-extlib or ocaml-xml-light
- Adds new dependency on libxml2
-
-* Tue Oct 05 2021 Richard W.M. Jones <rjones@redhat.com> - 1.1.0-2
- OCaml 4.13.1 build
-
-* Fri Oct 01 2021 Richard W.M. Jones <rjones@redhat.com> - 1.1.0-1
- New upstream development version 1.1.0
- Upstream switched to automake, simplifying the downstream build slightly.
- Remove Changelog file, no longer included upstream.
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri May 07 2021 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-20
- Do not include the package on POWER on RHEL 9
-  resolves: rhbz#1956935
-
-* Mon Mar  8 2021 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-19
- Bump and rebuild for ocaml-gettext update.
-
-* Tue Mar  2 10:06:37 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-18
- OCaml 4.12.0 build
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-16
- OCaml 4.11.1 rebuild
-
-* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-15
- OCaml 4.11.0 rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat May 30 2020 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-13
- Rebuild for updated ocaml-extlib (RHBZ#1837823).
-
-* Tue May 05 2020 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-12
- OCaml 4.11.0+dev2-2020-04-22 rebuild
-
-* Tue May  5 2020 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-11
- Fix broken documentation patch (RHEL/ELN only).
-
-* Wed Apr 22 2020 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-10
- OCaml 4.11.0 pre-release attempt 2
-
-* Thu Apr 09 2020 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-9
- Port RHEL 8.3.0 gating test to Fedora.
-
-* Sat Apr 04 2020 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-7
- Update all OCaml dependencies for RPM 4.16.
-
-* Thu Feb 27 2020 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-6
- OCaml 4.10.0 final.
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-4
- OCaml 4.10.0+beta1 rebuild.
-
-* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-3
- OCaml 4.09.0 (final) rebuild.
-
-* Wed Aug 21 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-2
- Rebuild against ocaml-libvirt 0.6.1.5.
-
-* Tue Aug 20 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-1
- New upstream version 1.0.9.
- Remove patches which are upstream and aarch64 build fix.
-
-* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-37
- OCaml 4.08.1 (final) rebuild.
-
-* Thu Aug 01 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-36
- OCaml 4.08.1 (rc2) rebuild.
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-32
- OCaml 4.07.0 (final) rebuild.
-
-* Wed Jun 20 2018 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-31
- OCaml 4.07.0-rc1 rebuild.
-
-* Wed Mar 28 2018 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-30
- Modify processcsv.py for Python 3.
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sat Nov 18 2017 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-28
- OCaml 4.06.0 rebuild.
-
-* Wed Aug 09 2017 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-27
- OCaml 4.05.0 rebuild.
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue Jun 27 2017 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-24
- OCaml 4.04.2 rebuild.
-
-* Sat May 13 2017 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-23
- OCaml 4.04.1 rebuild.
-
-* Tue Mar 28 2017 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-22
- Include all upstream patches since 1.0.8 was released.
- BR ocaml-libvirt with virConnectGetAllDomainStats API.
- Remove execstack hack, no longer needed on any arch.
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Nov 09 2016 Dan Horák <dan@danny.cz> - 1.0.8-20
- remove ExcludeArch
-
-* Sat Nov 05 2016 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-19
- Rebuild for OCaml 4.04.0.
- Kill further instances of -warn-error.
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-17
- OCaml 4.02.3 rebuild.
-
-* Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-16
- ocaml-4.02.2 final rebuild.
-
-* Thu Jun 18 2015 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-15
- ocaml-4.02.2 rebuild.
-
-* Tue Feb 17 2015 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-14
- ocaml-4.02.1 rebuild.
-
-* Sun Aug 31 2014 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-13
- ocaml-4.02.0 final rebuild.
-
-* Sat Aug 23 2014 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-12
- ocaml-4.02.0+rc1 rebuild.
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.8-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Aug 02 2014 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-10
- ocaml-4.02.0-0.8.git10e45753.fc22 rebuild.
-
-* Sat Aug 02 2014 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-9
- Do not warn about immutable strings.
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.8-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Mon Aug 05 2013 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-7
- Bump and rebuild.
-
-* Mon Jul 29 2013 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-6
- Include processcsv.py script and man page, but on RHEL only
-  (RHBZ#665817, RHBZ#912020)
- Clear executable stack flag on PPC, PPC64 (RHBZ#605124).
-
-* Fri Jun 28 2013 Cole Robinson <crobinso@redhat.com> - 1.0.8-5
- Update configure for aarch64 (bz #926701)
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Fri Dec 14 2012 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-3
- Rebuild for OCaml 4.00.1.
-
-* Fri Oct 12 2012 Richard W.M. Jones <rjones@redhat.com> - 1.0.8-2
- New upstream version 1.0.8.
- Requires tiny change to ocaml-libvirt, hence dep bump.
- Clean up the spec file.
- Remove explicit BR ocaml-camomile (not used AFAIK).
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Mar 23 2012 Richard W.M. Jones <rjones@redhat.com> - 1.0.7-2
- Require fixed ocaml-libvirt.
-
-* Tue Mar  6 2012 Richard W.M. Jones <rjones@redhat.com> - 1.0.7-1
- New upstream version 1.0.7.
- Includes true physical CPU reporting (when libvirt supports this).
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Fri Aug 12 2011 Richard W.M. Jones <rjones@redhat.com> - 1.0.6-1
- New upstream version 1.0.6.
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Thu Jan  6 2011 Richard W.M. Jones <rjones@redhat.com> - 1.0.5-1
- New upstream version 1.0.5.
- Rebuild against OCaml 3.12.0.
- Project website moved to people.redhat.com.
- Remove upstream patches.
-
 * Wed Dec 30 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.4-3
 - Force rebuild against latest ocaml-gettext 0.3.3 (RHBZ#508197#c10).

@ -469,7 +150,7 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 - New upstream release 1.0.0.
 - Force rebuild of manpage.

-* Tue Mar 18 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.1.1-1
+* Tue Mar 19 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.1.1-1
 - New upstream release 0.4.1.1.
 - Move configure to build section.
 - Pass RPM_OPT_FLAGS.