diff --git a/virt-top.spec b/virt-top.spec index 224d6d7..1a02cfc 100644 --- a/virt-top.spec +++ b/virt-top.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: virt-top Version: 1.1.2 -Release: 5%{?dist} +Release: 1%{?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: 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 +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 # Post-process output of CSV file (RHBZ#665817, RHBZ#912020). Source2: processcsv.py @@ -36,7 +36,11 @@ 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 @@ -66,6 +70,12 @@ 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 @@ -118,19 +128,6 @@ 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