public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/xload] rawhide: update to 1.2.1, built with meson, fixes rhbz#2294799
@ 2026-07-25 21:02 Filipe Rosset
  0 siblings, 0 replies; only message in thread
From: Filipe Rosset @ 2026-07-25 21:02 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/xload
            Branch : rawhide
            Commit : 57adeb1701e3be65607195ed15586de8a63e403e
            Author : Filipe Rosset <rosset.filipe@gmail.com>
            Date   : 2026-07-21T02:30:12-03:00
            Stats  : +43/-19 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/xload/c/57adeb1701e3be65607195ed15586de8a63e403e?branch=rawhide

            Log:
            update to 1.2.1, built with meson, fixes rhbz#2294799

Signed-off-by: Filipe Rosset <rosset.filipe@gmail.com>

---
diff --git a/.gitignore b/.gitignore
index 856fd34..94cc51e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/xload-*.tar.bz2
-/xload-1.1.4.tar.xz
-/xload-1.2.0.tar.gz
+/xload-*.tar.xz*
+/gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg

diff --git a/sources b/sources
index 26568b6..b16d1ca 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-SHA512 (xload-1.2.0.tar.gz) = 025ec2e92c00bf1f38c9930e29fac7949316d0ca36aaee0505e44fe639b577cf78a6613f05d2ad03cd634ad641c0a64837ac1d8291d7e14d5ab127d61be6d873
+SHA512 (xload-1.2.1.tar.xz) = 55bdf254d7521a54a9dc771a7e8d3d2750a64d8ec8274c3d2394cbe40358b03525a39d1e10c637bd9e66ee7f956d9aa55ae6c416a2611a35718e01f3b491fde1
+SHA512 (xload-1.2.1.tar.xz.sig) = cbad065fb19c9730ddd18f58f32ce84712ae0aa58fd30cf46fae9e13d13cfa0d42be8fb3f8e5ccdfcaaeca40d054ad5aab9276dc35eaeae0756f9681e618f629
+SHA512 (gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg) = a2b4aef6f48a6d6bab50f72a23295c7be63a3e6880237f52b1983e7cfa8b2798b7e30883e4e3f09dd7b905f0eb2952ba8993f7ea9b0172266337822c9be951c0

diff --git a/xload-1.2.1-setgroups.patch b/xload-1.2.1-setgroups.patch
new file mode 100644
index 0000000..a368859
--- /dev/null
+++ b/xload-1.2.1-setgroups.patch
@@ -0,0 +1,18 @@
+--- a/xload.c
++++ b/xload.c
+@@ -63,6 +63,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <grp.h>
+ #include <X11/Intrinsic.h>
+ #include <X11/Xatom.h>
+ #include <X11/StringDefs.h>
+@@ -198,6 +199,7 @@
+     InitLoadPoint();
+ 
+ #if !defined(_WIN32) || defined(__CYGWIN__)
++    (void) setgroups(0, NULL);
+     /* reset gid first while still (maybe) root */
+     if (setgid(getgid()) == -1) {
+ 	    fprintf(stderr, gettext("%s: setgid failed: %s\n"),

diff --git a/xload.spec b/xload.spec
index 90bf71d..ca76207 100644
--- a/xload.spec
+++ b/xload.spec
@@ -1,36 +1,40 @@
 Name:       xload
-Version:    1.2.0
+Version:    1.2.1
 Release:    %autorelease
 Summary:    Tool to display system load average
 
 License:    X11
 URL:        https://www.x.org
-Source0:    https://www.x.org/pub/individual/app/%{name}-%{version}.tar.gz
-
-BuildRequires:  automake libtool
-BuildRequires:  gcc make
-BuildRequires:  gettext-devel
+Source0:    https://xorg.freedesktop.org/archive/individual/app/%{name}-%{version}.tar.xz
+Source1:    https://xorg.freedesktop.org/archive/individual/app/%{name}-%{version}.tar.xz.sig
+Source2:    gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg
+Patch0:     xload-1.2.1-setgroups.patch
+BuildRequires:  gcc
+BuildRequires:  gettext
+BuildRequires:  gnupg2
+BuildRequires:  meson
 BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xmu)
-# BuildRequires:  pkgconfig(xt) # no longer needed
 BuildRequires:  pkgconfig(xaw7)
-BuildRequires:  pkgconfig(xorg-macros) >= 1.8
-
-Obsoletes:  xorg-x11-apps < 7.7-31
+BuildRequires:  pkgconfig(xmu)
+BuildRequires:  pkgconfig(xproto) >= 7.0.17
+BuildRequires:  pkgconfig(xt)
 
 %description
 xload displays a periodically updating histogram of the system load average.
 
 %prep
+%{gpgverify} --keyring=%{SOURCE2} --signature=%{SOURCE1} --data=%{SOURCE0}
 %autosetup
 
 %build
-autoreconf -v --install
-%configure --disable-silent-rules
-%make_build
+%meson
+%meson_build
 
 %install
-%make_install
+%meson_install
+
+%check
+%meson_test
 
 %files
 %license COPYING
@@ -40,3 +44,4 @@ autoreconf -v --install
 
 %changelog
 %autochangelog
+

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

only message in thread, other threads:[~2026-07-25 21:02 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-25 21:02 [rpms/xload] rawhide: update to 1.2.1, built with meson, fixes rhbz#2294799 Filipe Rosset

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