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] 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