diff --git a/libguestfs.keyring b/libguestfs.keyring new file mode 100644 index 0000000..bb3eb55 Binary files /dev/null and b/libguestfs.keyring differ 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.spec b/virt-top.spec index 7fbd2e3..224d6d7 100644 --- a/virt-top.spec +++ b/virt-top.spec @@ -1,25 +1,31 @@ -%undefine _package_note_flags +# OCaml packages not built on i686 since OCaml 5 / Fedora 39. +ExcludeArch: %{ix86} + Name: virt-top -Version: 1.1.1 +Version: 1.1.2 Release: 5%{?dist} Summary: Utility like top(1) for displaying virtualization stats -License: GPLv2+ +License: GPL-2.0-or-later %if 0%{?rhel} # No qemu-kvm on POWER (RHBZ#1946532). ExcludeArch: %{power64} %endif -URL: http://people.redhat.com/~rjones/virt-top/ -Source0: http://people.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz +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). -Source1: processcsv.py -Source2: processcsv.py.pod +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. -Patch0: virt-top-1.0.9-processcsv-documentation.patch +Patch1: virt-top-1.0.9-processcsv-documentation.patch BuildRequires: gcc BuildRequires: make @@ -41,6 +47,7 @@ BuildRequires: libxml2-devel BuildRequires: perl-interpreter BuildRequires: perl(Pod::Perldoc) BuildRequires: gawk +BuildRequires: gnupg2 %description @@ -53,12 +60,16 @@ different virtualization systems. %prep +%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %setup -q %if 0%{?rhel} >= 6 -%patch0 -p1 +%patch -P1 -p1 %endif +# "ocamlfind byte" has been removed as an alias +sed -i 's/\(OCAMLBEST=\)byte/\1ocamlc/' configure + %build %configure @@ -72,7 +83,7 @@ make -C src virt-top.1 %if 0%{?rhel} >= 6 # Build processcsv.py.1. pod2man -c "Virtualization Support" --release "%{name}-%{version}" \ - %{SOURCE2} > processcsv.py.1 + %{SOURCE3} > processcsv.py.1 %endif @@ -88,7 +99,7 @@ install -m 0644 src/virt-top.1 $RPM_BUILD_ROOT%{_mandir}/man1 %if 0%{?rhel} >= 6 # Install processcsv.py. -install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir} +install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir} # Install processcsv.py(1). install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/ @@ -96,7 +107,8 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/ %files -f %{name}.lang -%doc COPYING README TODO +%doc README TODO +%license COPYING %{_bindir}/virt-top %{_mandir}/man1/virt-top.1* %if 0%{?rhel} >= 6 @@ -106,6 +118,80 @@ 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 + +* 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 + +* 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 + +* 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 + +* Wed Jun 19 2024 Richard W.M. Jones - 1.1.1-20 +- OCaml 5.2.0 ppc64le fix + +* Thu May 30 2024 Richard W.M. Jones - 1.1.1-19 +- OCaml 5.2.0 for Fedora 41 + +* Sat Jan 27 2024 Fedora Release Engineering - 1.1.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 18 2023 Richard W.M. Jones - 1.1.1-17 +- OCaml 5.1.1 + s390x code gen fix for Fedora 40 + +* Tue Dec 12 2023 Richard W.M. Jones - 1.1.1-16 +- OCaml 5.1.1 rebuild for Fedora 40 + +* Mon Nov 27 2023 Richard W.M. Jones - 1.1.1-15 +- Fix build issue with libxml2 2.12.1 + +* Thu Oct 05 2023 Richard W.M. Jones - 1.1.1-14 +- OCaml 5.1 rebuild for Fedora 40 + +* Sat Jul 22 2023 Fedora Release Engineering - 1.1.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 Richard W.M. Jones - 1.1.1-12 +- OCaml 5.0 rebuild for Fedora 39 + +* Mon Jul 10 2023 Jerry James - 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 - 1.1.1-10 +- Migrated to SPDX license + +* Tue Jan 24 2023 Richard W.M. Jones - 1.1.1-9 +- Rebuild OCaml packages for F38 + +* Sat Jan 21 2023 Fedora Release Engineering - 1.1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Nov 28 2022 Richard W.M. Jones - 1.1.1-7 +- Fix "Input/output error" in journal (RHBZ#2148798) + +* Tue Oct 18 2022 Richard W.M. Jones - 1.1.1-6 +- Check tarball signature + * Sat Jul 23 2022 Fedora Release Engineering - 1.1.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild