Update to 1.2.2 upstream release

- Resolves: rhbz#2517697

Commit authored by Packit automation (https://packit.dev/)

.gitignore

@@ -1,2 +1,2 @@
-/xload-*.tar.bz2
-/xload-1.1.4.tar.xz
+/xload-*.tar.xz*
+/gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg

.packit.yaml

@@ -0,0 +1,19 @@
+# See the documentation for more information:
+# https://packit.dev/docs/configuration/
+
+specfile_path: xload.spec
+
+copy_upstream_release_description: false
+
+jobs:
+  - job: pull_from_upstream
+    trigger: release
+    dist_git_branches:
+      - fedora-rawhide
+
+  - job: koji_build
+    trigger: commit
+    allowed_committers: ['packit','all_admins']
+    dist_git_branches:
+      - fedora-rawhide
+

README.packit

@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 1.16.2.post1.dev12+g819bb7962.

changelog

@@ -0,0 +1,47 @@
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jul 13 2024 Jos de Kloe <josdekloe@gmail.com> 1.2.0-1
+- Update to 1.2.0
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Dec 28 2022 Jos de Kloe <josdekloe@gmail.com> 1.1.4-3
+- SPDX migration: change generic MIT to specific X11 license tag.
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Apr 05 2022 Jos de Kloe <josdekloe@gmail.com> 1.1.4-1
+- Update to 1.1.4
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Apr 08 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.1.3-2
+- Fix Obsoletes line to actually obsolete the -30 xorg-x11-apps (#1947245)
+
+* Tue Mar 02 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.1.3-1
+- Split xload out from xorg-x11-apps into a separate package (#1933946)

sources

@@ -1 +1,3 @@
-SHA512 (xload-1.1.4.tar.xz) = 114babe4e5a60f4713f9e4627ee0a1bbb2f1f238cb46f24c38aecff67f25e6b0f58cbd554c71095ddc2b01398adbfa379550a34c23c413db52157648028554f2
+SHA512 (xload-1.2.2.tar.xz) = 98d853543da8a1b86fc474a6748425861bac01c4888087d052c3f00baca6aade2d4ecfa3ee96feb32ed4fbaa4f89816888fe03a022b8fa19c71f147a0a9a4a48
+SHA512 (xload-1.2.2.tar.xz.sig) = 4999ff44f113f13653a3d5758f19f00a75ad8024a54e082e490056db3846ce8d949a5288492f7431f09a8e58ac944f8e2290e8b0a91cfa5ea5720d40a5a733da
+SHA512 (gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg) = a2b4aef6f48a6d6bab50f72a23295c7be63a3e6880237f52b1983e7cfa8b2798b7e30883e4e3f09dd7b905f0eb2952ba8993f7ea9b0172266337822c9be951c0

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"),

xload.spec

@@ -1,36 +1,40 @@
 Name:       xload
-Version:    1.1.4
-Release:    2%{?dist}
+Version:    1.2.2
+Release:    %autorelease
 Summary:    Tool to display system load average
 
-License:    MIT
+License:    X11
 URL:        https://www.x.org
-Source0:    https://www.x.org/pub/individual/app/%{name}-%{version}.tar.xz
-
-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)
 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
@@ -39,20 +43,5 @@ autoreconf -v --install
 %{_datadir}/X11/app-defaults/XLoad
 
 %changelog
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+%autochangelog
 
-* Tue Apr 05 2022 Jos de Kloe <josdekloe@gmail.com> 1.1.4-1
-- Update to 1.1.4
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Apr 08 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.1.3-2
-- Fix Obsoletes line to actually obsolete the -30 xorg-x11-apps (#1947245)
-
-* Tue Mar 02 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.1.3-1
-- Split xload out from xorg-x11-apps into a separate package (#1933946)