public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/virt-top] rawhide: New upstream version 1.1.3
@ 2026-07-13 15:29 Richard W.M. Jones
  0 siblings, 0 replies; only message in thread
From: Richard W.M. Jones @ 2026-07-13 15:29 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/virt-top
            Branch : rawhide
            Commit : 6c6b26968f09e8e785ec8f16c47845395575a39f
            Author : Richard W.M. Jones <rjones@redhat.com>
            Date   : 2026-07-13T16:29:03+01:00
            Stats  : +11/-49 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/virt-top/c/6c6b26968f09e8e785ec8f16c47845395575a39f?branch=rawhide

            Log:
            New upstream version 1.1.3

Includes ocaml-curses 1.0.12 patch, so drop it.
New upstream URLs.

---
diff --git a/sources b/sources
index ddae418..71024c4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (virt-top-1.1.2.tar.gz) = 1dd495daf106601236680b6d028262a217b8b93edb51c3f6c148fef7b452d8d188f1df18d500338377d9becff2174a6e33ccda4eaa913e7a159820d7bfca3a3c
-SHA512 (virt-top-1.1.2.tar.gz.sig) = db754791923aa30838b5f33bd6a523fda4a34068e9b20cdedc09e56a72de7e894f156e70106c5274f9e8121dde25cfc594e9fcb932dca08af15fe67e0c27990a
+SHA512 (virt-top-1.1.3.tar.gz) = 1ba34155e2ff24801df997289f980068704b196dc0a45593730be25a6f6024249ae7d3d46e9a8b00561b6306d27ff5810c175e89dd256e47d78ab9397221b42f
+SHA512 (virt-top-1.1.3.tar.gz.sig) = ce982ca6837711917090dcd2e4fea83571f48e385be55274522344d0b511ecb78abb5984c3d2e12deea7f6f6169a24d756d1780765c9c7bf9b52e3ee339e8a03

diff --git a/virt-top-1.1.2-curses.patch b/virt-top-1.1.2-curses.patch
deleted file mode 100644
index 5524bbf..0000000
--- a/virt-top-1.1.2-curses.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- virt-top-1.1.2/src/top.ml.orig	2022-11-23 07:10:48.000000000 -0700
-+++ virt-top-1.1.2/src/top.ml	2026-07-09 14:32:11.943607218 -0600
-@@ -284,26 +284,18 @@ let sleep = Unix.sleep
- let millisleep n =
-   ignore (Unix.select [] [] [] (float n /. 1000.))
- 
--(* The curses getstr/getnstr functions are just weird.
-- * This helper function also enables echo temporarily.
-- *)
-+(* This helper function enables echo temporarily. *)
- let get_string maxlen =
-   ignore (echo ());
--  let str = Bytes.create maxlen in
--  (* Safe because binding calls getnstr.  However the unsafe cast
--   * to string is required because ocaml-curses needs to be fixed.
--   *)
--  let ok = getstr (Obj.magic str) in
-+  let ret = match getstr() with
-+  | Error _ -> ""
-+  | Ok str -> (* Chop at first `\0'. *)
-+    match String.index_opt str '\000' with
-+    | Some(index) -> String.sub str 0 index
-+    | None -> str (* it is full maxlen bytes *)
-+  in
-   ignore (noecho ());
--  if not ok then ""
--  else (
--    (* Chop at first '\0'. *)
--    try
--      let i = Bytes.index str '\000' in
--      Bytes.sub_string str 0 i
--    with
--      Not_found -> Bytes.to_string str (* it is full maxlen bytes *)
--  )
-+  ret
- 
- (* Main loop. *)
- let rec main_loop ((conn, batch_mode, script_mode, csv_enabled, stream_mode, _, _, _)

diff --git a/virt-top.spec b/virt-top.spec
index 49fedce..7afd374 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -2,8 +2,8 @@
 ExcludeArch: %{ix86}
 
 Name:           virt-top
-Version:        1.1.2
-Release:        8%{?dist}
+Version:        1.1.3
+Release:        1%{?dist}
 Summary:        Utility like top(1) for displaying virtualization stats
 License:        GPL-2.0-or-later
 
@@ -12,6 +12,7 @@ License:        GPL-2.0-or-later
 ExcludeArch:    %{power64}
 %endif
 
+VCS:            https://github.com/rwmjones/virt-top
 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
@@ -27,15 +28,11 @@ Source4:        libguestfs.keyring
 # included in RHEL builds.
 Patch1:         virt-top-1.0.9-processcsv-documentation.patch
 
-# Adapt to ocaml-curses 1.0.12, which fixed the getstr/getnstr weirdness
-Patch2:         virt-top-1.1.2-curses.patch
-
 BuildRequires:  gcc
 BuildRequires:  make
 BuildRequires:  ocaml >= 3.10.2
 BuildRequires:  ocaml-findlib
-# Need the ncurses / ncursesw (--enable-widec) fix.
-BuildRequires:  ocaml-curses-devel >= 1.0.3-7
+BuildRequires:  ocaml-curses-devel >= 1.0.12
 BuildRequires:  ocaml-calendar-devel
 BuildRequires:  ocaml-libvirt-devel >= 0.6.1.5
 BuildRequires:  ocaml-gettext-devel >= 0.3.3
@@ -69,8 +66,6 @@ different virtualization systems.
 %patch -P1 -p1
 %endif
 
-%patch -P2 -p1
-
 # "ocamlfind byte" has been removed as an alias
 sed -i 's/\(OCAMLBEST=\)byte/\1ocamlc/' configure
 
@@ -122,6 +117,11 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %changelog
+* Mon Jul 13 2026 Richard W.M. Jones <rjones@redhat.com> - 1.1.3-1
+- New upstream version 1.1.3
+- Includes ocaml-curses 1.0.12 patch, so drop it.
+- New upstream URLs.
+
 * Thu Jul 09 2026 Jerry James <loganjerry@gmail.com> - 1.1.2-8
 - OCaml 5.5.0 rebuild
 - Add patch to adapt to ocaml-curses 1.0.12

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-13 15:29 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-13 15:29 [rpms/virt-top] rawhide: New upstream version 1.1.3 Richard W.M. Jones

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox