diff --git a/.gitignore b/.gitignore index 94cc51e..6b4cf55 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/xload-*.tar.xz* -/gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg +/xload-*.tar.bz2 diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index 9722db4..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# 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 - diff --git a/README.packit b/README.packit deleted file mode 100644 index 09d231a..0000000 --- a/README.packit +++ /dev/null @@ -1,3 +0,0 @@ -This repository is maintained by packit. -https://packit.dev/ -The file was generated using packit 1.16.2.post1.dev12+g819bb7962. diff --git a/changelog b/changelog deleted file mode 100644 index 5f01b9f..0000000 --- a/changelog +++ /dev/null @@ -1,47 +0,0 @@ -* Fri Jul 17 2026 Fedora Release Engineering - 1.2.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 1.2.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 1.2.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 1.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jul 13 2024 Jos de Kloe 1.2.0-1 -- Update to 1.2.0 - -* Sat Jan 27 2024 Fedora Release Engineering - 1.1.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.1.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.1.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Dec 28 2022 Jos de Kloe 1.1.4-3 -- SPDX migration: change generic MIT to specific X11 license tag. - -* Sat Jul 23 2022 Fedora Release Engineering - 1.1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Apr 05 2022 Jos de Kloe 1.1.4-1 -- Update to 1.1.4 - -* Sat Jan 22 2022 Fedora Release Engineering - 1.1.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Apr 08 2021 Peter Hutterer - 1.1.3-2 -- Fix Obsoletes line to actually obsolete the -30 xorg-x11-apps (#1947245) - -* Tue Mar 02 2021 Peter Hutterer 1.1.3-1 -- Split xload out from xorg-x11-apps into a separate package (#1933946) diff --git a/sources b/sources index c856fe8..4d0677f 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (xload-1.2.2.tar.xz) = 98d853543da8a1b86fc474a6748425861bac01c4888087d052c3f00baca6aade2d4ecfa3ee96feb32ed4fbaa4f89816888fe03a022b8fa19c71f147a0a9a4a48 -SHA512 (xload-1.2.2.tar.xz.sig) = 4999ff44f113f13653a3d5758f19f00a75ad8024a54e082e490056db3846ce8d949a5288492f7431f09a8e58ac944f8e2290e8b0a91cfa5ea5720d40a5a733da -SHA512 (gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg) = a2b4aef6f48a6d6bab50f72a23295c7be63a3e6880237f52b1983e7cfa8b2798b7e30883e4e3f09dd7b905f0eb2952ba8993f7ea9b0172266337822c9be951c0 +SHA512 (xload-1.1.3.tar.bz2) = 8dbc4f0cee7b30d7381be819152b27653d9b0049266e59bde2e2c972a88c4f2bdea766fc407bbdfef15d0aab30fedc756189a1048170a812853133a5094fe7a5 diff --git a/xload-1.2.1-setgroups.patch b/xload-1.2.1-setgroups.patch deleted file mode 100644 index a368859..0000000 --- a/xload-1.2.1-setgroups.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/xload.c -+++ b/xload.c -@@ -63,6 +63,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -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 309e4c7..ef545b6 100644 --- a/xload.spec +++ b/xload.spec @@ -1,40 +1,36 @@ Name: xload -Version: 1.2.2 -Release: %autorelease +Version: 1.1.3 +Release: 2%{?dist} Summary: Tool to display system load average -License: X11 +License: MIT URL: https://www.x.org -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 +Source0: https://www.x.org/pub/individual/app/%{name}-%{version}.tar.bz2 + +BuildRequires: automake libtool +BuildRequires: gcc make +BuildRequires: gettext-devel BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xaw7) BuildRequires: pkgconfig(xmu) -BuildRequires: pkgconfig(xproto) >= 7.0.17 BuildRequires: pkgconfig(xt) +BuildRequires: pkgconfig(xaw7) +BuildRequires: pkgconfig(xorg-macros) >= 1.8 + +Obsoletes: xorg-x11-apps < 7.7-31 %description xload displays a periodically updating histogram of the system load average. %prep -%{gpgverify} --keyring=%{SOURCE2} --signature=%{SOURCE1} --data=%{SOURCE0} %autosetup %build -%meson -%meson_build +autoreconf -v --install +%configure --disable-silent-rules +%make_build %install -%meson_install - -%check -%meson_test +%make_install %files %license COPYING @@ -43,5 +39,8 @@ xload displays a periodically updating histogram of the system load average. %{_datadir}/X11/app-defaults/XLoad %changelog -%autochangelog +* Thu Apr 08 2021 Peter Hutterer - 1.1.3-2 +- Fix Obsoletes line to actually obsolete the -30 xorg-x11-apps (#1947245) +* Tue Mar 02 2021 Peter Hutterer 1.1.3-1 +- Split xload out from xorg-x11-apps into a separate package (#1933946)