Rebase to virt-top 1.1.1

resolves: rhbz#2135768
This commit is contained in:
Richard W.M. Jones 2022-10-18 14:11:47 +01:00
parent 66c599aa2b
commit 9fd1897b61
4 changed files with 27 additions and 33 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
/.build*.log /.build*.log
/clog /clog
/virt-top-*.tar.gz /virt-top-*.tar.gz
/virt-top-*.tar.gz.sig

BIN
libguestfs.keyring Normal file

Binary file not shown.

View File

@ -1 +1,2 @@
SHA512 (virt-top-1.0.9.tar.gz) = 3e0e52bece411f8b73c57beea554937d779bbfb18d16cf5b7f13f8c843e747c2d89ce8253b9cf4db2bd6495c4e4826cb68467cc48bb53bfd65c4aceed043d086 SHA512 (virt-top-1.1.1.tar.gz) = 4f4c7338f1ce1f82b1a9287c256da4b60d7b2e5163ea4b19eb0257c104303dcecf28177f8034e34d255fec462adc19ab61e6a4b9db857da02f2cdf2b1c818093
SHA512 (virt-top-1.1.1.tar.gz.sig) = 6236b7a68492663d743f1ee2e50ea91adafab97654c333d2b92f66a0c7a9cd5d6748fe2467f29db80c65428d804624a42d64f3ee7d0d09f612e95effec0e395e

View File

@ -1,9 +1,7 @@
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %undefine _package_note_flags
%global debug_package %{nil}
Name: virt-top Name: virt-top
Version: 1.0.9 Version: 1.1.1
Release: 21%{?dist} Release: 6%{?dist}
Summary: Utility like top(1) for displaying virtualization stats Summary: Utility like top(1) for displaying virtualization stats
License: GPLv2+ License: GPLv2+
@ -14,31 +12,28 @@ ExcludeArch: %{power64}
URL: http://people.redhat.com/~rjones/virt-top/ URL: http://people.redhat.com/~rjones/virt-top/
Source0: http://people.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz 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). # Post-process output of CSV file (RHBZ#665817, RHBZ#912020).
Source1: processcsv.py Source2: processcsv.py
Source2: processcsv.py.pod 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 # Adds a link to processcsv to the man page. This patch is only
# included in RHEL builds. # included in RHEL builds.
Patch0: virt-top-1.0.9-processcsv-documentation.patch Patch0: virt-top-1.0.9-processcsv-documentation.patch
# Upstream patch to fix FTBFS with ocaml libvirt 0.6.1.5. BuildRequires: gcc
Patch1: 0001-libvirt-Handle-VIR_DOMAIN_PMSUSPENDED-state.patch
BuildRequires: make BuildRequires: make
BuildRequires: ocaml >= 3.10.2 BuildRequires: ocaml >= 3.10.2
BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-findlib-devel
# Need the ncurses / ncursesw (--enable-widec) fix. # Need the ncurses / ncursesw (--enable-widec) fix.
BuildRequires: ocaml-curses-devel >= 1.0.3-7 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-calendar-devel
BuildRequires: ocaml-libvirt-devel >= 0.6.1.5 BuildRequires: ocaml-libvirt-devel >= 0.6.1.5
# Tortuous list of BRs for gettext.
BuildRequires: ocaml-gettext-devel >= 0.3.3 BuildRequires: ocaml-gettext-devel >= 0.3.3
BuildRequires: ocaml-fileutils-devel BuildRequires: ocaml-fileutils-devel
# For msgfmt: # For msgfmt:
@ -46,9 +41,11 @@ BuildRequires: gettext
# Non-OCaml BRs. # Non-OCaml BRs.
BuildRequires: libvirt-devel BuildRequires: libvirt-devel
BuildRequires: libxml2-devel
BuildRequires: perl-interpreter BuildRequires: perl-interpreter
BuildRequires: perl(Pod::Perldoc) BuildRequires: perl(Pod::Perldoc)
BuildRequires: gawk BuildRequires: gawk
BuildRequires: gnupg2
%description %description
@ -61,34 +58,27 @@ different virtualization systems.
%prep %prep
%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%setup -q %setup -q
%if 0%{?rhel} >= 6 %if 0%{?rhel} >= 6
%patch0 -p1 %patch0 -p1
%endif %endif
%patch1 -p1
%build %build
%configure %configure
make all make
%if %opt
make opt
strip src/virt-top.opt
%endif
# Build translations.
make -C po
# Force rebuild of man page. # Force rebuild of man page.
# There is a missing man_MANS rule, will fix upstream in next version.
rm -f src/virt-top.1 rm -f src/virt-top.1
make -C src virt-top.1 make -C src virt-top.1
%if 0%{?rhel} >= 6 %if 0%{?rhel} >= 6
# Build processcsv.py.1. # Build processcsv.py.1.
pod2man -c "Virtualization Support" --release "%{name}-%{version}" \ pod2man -c "Virtualization Support" --release "%{name}-%{version}" \
%{SOURCE2} > processcsv.py.1 %{SOURCE3} > processcsv.py.1
%endif %endif
@ -96,17 +86,15 @@ pod2man -c "Virtualization Support" --release "%{name}-%{version}" \
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# Install translations. # Install translations.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale
make -C po install PODIR="$RPM_BUILD_ROOT%{_datadir}/locale"
%find_lang %{name} %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 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
install -m 0644 src/virt-top.1 $RPM_BUILD_ROOT%{_mandir}/man1 install -m 0644 src/virt-top.1 $RPM_BUILD_ROOT%{_mandir}/man1
%if 0%{?rhel} >= 6 %if 0%{?rhel} >= 6
# Install processcsv.py. # Install processcsv.py.
install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir} install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}
# Install processcsv.py(1). # Install processcsv.py(1).
install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
@ -114,7 +102,7 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
%files -f %{name}.lang %files -f %{name}.lang
%doc COPYING README TODO ChangeLog %doc COPYING README TODO
%{_bindir}/virt-top %{_bindir}/virt-top
%{_mandir}/man1/virt-top.1* %{_mandir}/man1/virt-top.1*
%if 0%{?rhel} >= 6 %if 0%{?rhel} >= 6
@ -124,6 +112,10 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
%changelog %changelog
* Tue Oct 18 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-6
- Rebase to virt-top 1.1.1
resolves: rhbz#2135768
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.9-21 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.9-21
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688 Related: rhbz#1991688