From 7f256431dc03c256aadcbe7332a2050052888f3c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 28 Feb 2025 11:56:26 +0000 Subject: [PATCH 1/6] Remove unused patch lines Fixes: commit 2db015db276f05056a68f6e922896c0c4d028dfe --- virt-top.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/virt-top.spec b/virt-top.spec index 1a02cfc..f987899 100644 --- a/virt-top.spec +++ b/virt-top.spec @@ -70,12 +70,6 @@ different virtualization systems. %if 0%{?rhel} >= 6 %patch -P1 -p1 %endif -%patch -P2 -p1 -%patch -P3 -p1 -%patch -P4 -p1 -%ifnarch %{ocaml_native_compiler} -%patch -P5 -p1 -%endif # "ocamlfind byte" has been removed as an alias sed -i 's/\(OCAMLBEST=\)byte/\1ocamlc/' configure From a01d2f0db344f18b305dbec1de7db8ed04cd399c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 3 Apr 2025 09:47:56 +0100 Subject: [PATCH 2/6] Enable ocaml-gettext again --- virt-top.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/virt-top.spec b/virt-top.spec index f987899..04a2528 100644 --- a/virt-top.spec +++ b/virt-top.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: virt-top Version: 1.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utility like top(1) for displaying virtualization stats License: GPL-2.0-or-later @@ -36,11 +36,7 @@ BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-curses-devel >= 1.0.3-7 BuildRequires: ocaml-calendar-devel BuildRequires: ocaml-libvirt-devel >= 0.6.1.5 -%if 0%{?fedora} <= 42 -# Disable ocaml-gettext-devel in Rawhide temporarily. -# https://src.fedoraproject.org/rpms/ocaml-gettext/pull-request/3 BuildRequires: ocaml-gettext-devel >= 0.3.3 -%endif BuildRequires: ocaml-fileutils-devel # For msgfmt: BuildRequires: gettext @@ -122,6 +118,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/ %changelog +* 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 From 9408e4cecd4f38227698b13f8e418a1b79f936ae Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 12 Jul 2025 16:37:42 -0600 Subject: [PATCH 3/6] Rebuild to fix OCaml dependencies - Change http URLs to https --- virt-top.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/virt-top.spec b/virt-top.spec index 04a2528..1ab03a4 100644 --- a/virt-top.spec +++ b/virt-top.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: virt-top Version: 1.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Utility like top(1) for displaying virtualization stats License: GPL-2.0-or-later @@ -12,9 +12,9 @@ License: GPL-2.0-or-later ExcludeArch: %{power64} %endif -URL: http://people.redhat.com/~rjones/virt-top/ -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 +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). Source2: processcsv.py @@ -118,6 +118,10 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/ %changelog +* 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 From 4fde25577d40e439d3d7d5c63d780a5f7f089115 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:08:59 +0000 Subject: [PATCH 4/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- virt-top.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-top.spec b/virt-top.spec index 1ab03a4..c7d9969 100644 --- a/virt-top.spec +++ b/virt-top.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: virt-top Version: 1.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Utility like top(1) for displaying virtualization stats License: GPL-2.0-or-later @@ -118,6 +118,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/ %changelog +* 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 From 8a797311d93cfe339872737ebe6643681c39f416 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 14 Oct 2025 20:53:52 +0100 Subject: [PATCH 5/6] OCaml 5.4.0 rebuild --- virt-top.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-top.spec b/virt-top.spec index c7d9969..071a5a3 100644 --- a/virt-top.spec +++ b/virt-top.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: virt-top Version: 1.1.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Utility like top(1) for displaying virtualization stats License: GPL-2.0-or-later @@ -118,6 +118,9 @@ 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 From c72a1f45b73411f1da5150136cc9e24697948b8a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 13 Jan 2026 20:55:21 -0700 Subject: [PATCH 6/6] Fix a changelog entry --- virt-top.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt-top.spec b/virt-top.spec index 071a5a3..224d6d7 100644 --- a/virt-top.spec +++ b/virt-top.spec @@ -124,7 +124,7 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/ * 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 +* Mon Jul 07 2025 Jerry James - 1.1.2-3 - Rebuild to fix OCaml dependencies - Change http URLs to https