From 0e203a5774b20b24d946d16ef42f58a7f8378d8c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 5 Jun 2025 08:12:25 +0200 Subject: [PATCH 1/7] Rebuilt for Python 3.14 --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index fe9bf5c..5320ed1 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -39,7 +39,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 5.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -374,6 +374,9 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Thu Jun 05 2025 Python Maint - 5.9-2 +- Rebuilt for Python 3.14 + * Sat Jan 18 2025 Pavel Raiskup - 5.9-1 - New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.9 From 2758a259369820be91c3ce342af42289ffb71034 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 12 Jun 2025 13:12:32 +0200 Subject: [PATCH 2/7] New upstream release Version: 5.10-1 --- build-and-update-all-branches | 20 +++++++--------- resalloc.spec | 45 +++++++++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 51 insertions(+), 16 deletions(-) diff --git a/build-and-update-all-branches b/build-and-update-all-branches index 502bf7c..9d7b6da 100755 --- a/build-and-update-all-branches +++ b/build-and-update-all-branches @@ -1,13 +1,14 @@ #! /bin/sh -# Prepare main branch, review the list of branches below and then execute this +# Prepare rawhide branch, review the list of branches below and then execute this # script. -branches='main f41 f40 epel8 epel9' +main=main +branches="$main epel8 epel9 f41 f42" exit_handler () { - git checkout main + git checkout $main } trap exit_handler EXIT @@ -19,21 +20,18 @@ koji hello tasks= for branch in $branches; do - if test $branch != main; then + if test $branch != $main; then git checkout "$branch" - git merge main + git merge $main fi git push - skip_nvr_check= - if test $branch = epel7; then - skip_nvr_check=--skip-nvr-check - fi - tasks="${tasks}`fedpkg build $skip_nvr_check --nowait | grep 'Created task' | cut -d: -f2`" + tasks="${tasks}`fedpkg build --nowait | grep 'Created task' | cut -d: -f2`" done if test -n "$tasks"; then koji watch-task $tasks fi -git checkout main +set -- $branches +git checkout $1 fedpkg update diff --git a/resalloc.spec b/resalloc.spec index 5320ed1..7ddaa30 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -33,13 +33,25 @@ the purposes of CI/CD tasks. %bcond_with python3 %endif +# Modern distributions (using RPM v4.19+; for example, Fedora 39+) do not +# require the %%pre scriptlet for creating users/groups because the sysusers +# feature is now built directly into RPM. Simply including the sysusers +# `mock.conf` file in a package payload is sufficient to leverage this feature. +# However, for older distributions that lack this capability, we still define +# the %%pre scriptlet. +%if (0%{?rhel} && 0%{?rhel} < 10) || (0%{?mageia} && 0%{?mageia} < 10) || (0%{?suse_version} && 0%{?suse_version} < 1660) +%bcond_without sysusers_compat +%else +%bcond_with sysusers_compat +%endif + %global default_python %{?with_python3:python3}%{!?with_python3:python2} %global default_sitelib %{?with_python3:%python3_sitelib}%{!?with_python3:%python_sitelib} Name: %srcname Summary: %sum - client tooling -Version: 5.9 -Release: 2%{?dist} +Version: 5.10 +Release: 1%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -82,6 +94,10 @@ BuildRequires: python-yaml Requires: %default_python-%srcname = %version-%release +%if %{with sysusers_compat} +Requires(pre): shadow-utils +%endif + Source0: https://github.com/praiskup/%name/releases/download/v%version/%name-%version.tar.gz Source1: resalloc.service Source5: resalloc-agent-spawner.service @@ -116,7 +132,6 @@ Requires: python-sqlalchemy Requires: python-yaml %endif -Requires(pre): /usr/sbin/useradd %description server %desc @@ -156,7 +171,6 @@ it shows page with information about resalloc resources. %package agent-spawner Summary: %sum - daemon starting agent-like resources -Requires(pre): /usr/sbin/useradd Requires: python3-copr-common >= 0.23 Requires: python3-daemon Requires: python3-redis @@ -219,6 +233,16 @@ restorecon -R %_var/www/cgi-%{name} || : rm -r resalloc_agent_spawner %endif +# Create sysusers.d config files +cat >resalloc.sysusers.conf <resalloc-agent-spawner.sysusers.conf < - 5.10-1 +- new upstream release, packages use RPM built-in sysusers support: + https://github.com/praiskup/resalloc/releases/tag/v5.10 + * Thu Jun 05 2025 Python Maint - 5.9-2 - Rebuilt for Python 3.14 diff --git a/sources b/sources index 21c360d..8e39ac1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-5.9.tar.gz) = 270c7a5d080fd8a2bfaddafb6f220e3749e70367494f6e10861bebf1c5a8f93d965ec1393b3baec1037591dec15a1769a4d29132b1f340259fa60e4d8143d4dc +SHA512 (resalloc-5.10.tar.gz) = a8116bd663ffe75c5322c929dd0609569dfe6a0e8efe6c9fdebcd81882d99f6c077fb6a0b260ceae074f4994eb86d9c93a9f22b68251c39e7b8e29c4c5797e34 From e065fd3c642144f3a36a806059d8312a1a8ec58b Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 21 Jul 2025 15:29:22 +0200 Subject: [PATCH 3/7] New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.11 --- resalloc.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resalloc.spec b/resalloc.spec index 7ddaa30..96a3adf 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -50,7 +50,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling -Version: 5.10 +Version: 5.11 Release: 1%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc diff --git a/sources b/sources index 8e39ac1..f458908 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-5.10.tar.gz) = a8116bd663ffe75c5322c929dd0609569dfe6a0e8efe6c9fdebcd81882d99f6c077fb6a0b260ceae074f4994eb86d9c93a9f22b68251c39e7b8e29c4c5797e34 +SHA512 (resalloc-5.11.tar.gz) = 73becebe671a59912006eb4b227c10f6ac7be91a91e94cff470ac6bb32eb4447ec905b1d151c5eeb54fdc6c2a6179f9b7d606bcf25c3f9caeb63bde171759ac3 From 6c799be7e51a3f460a5f80bbc9e35543841be095 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 21 Jul 2025 15:37:35 +0200 Subject: [PATCH 4/7] Forgotten changelog entry --- resalloc.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resalloc.spec b/resalloc.spec index 96a3adf..5d19b70 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -407,6 +407,10 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Mon Jul 21 2025 Pavel Raiskup - 5.11-1 +- new upstream release, don't keep cleanup processes indefinitely: + https://github.com/praiskup/resalloc/releases/tag/v5.11 + * Thu Jun 12 2025 Pavel Raiskup - 5.10-1 - new upstream release, packages use RPM built-in sysusers support: https://github.com/praiskup/resalloc/releases/tag/v5.10 From 9b7713aa1fd75a29b8b8ef1a30fcf156ffa6384a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 11:54:41 +0000 Subject: [PATCH 5/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index 5d19b70..9810bb0 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -51,7 +51,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 5.11 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -407,6 +407,9 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 5.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jul 21 2025 Pavel Raiskup - 5.11-1 - new upstream release, don't keep cleanup processes indefinitely: https://github.com/praiskup/resalloc/releases/tag/v5.11 From bd93fdb44c6ca9449c56f1b3eb27977a83024246 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:15:37 +0200 Subject: [PATCH 6/7] Rebuilt for Python 3.14.0rc2 bytecode --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index 9810bb0..ff5c4d2 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -51,7 +51,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 5.11 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -407,6 +407,9 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Fri Aug 15 2025 Python Maint - 5.11-3 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 5.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From c46cbb5e81d436341d773ca988012b89851380cb Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:53:02 +0200 Subject: [PATCH 7/7] Rebuilt for Python 3.14.0rc3 bytecode --- resalloc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resalloc.spec b/resalloc.spec index ff5c4d2..7093616 100644 --- a/resalloc.spec +++ b/resalloc.spec @@ -51,7 +51,7 @@ the purposes of CI/CD tasks. Name: %srcname Summary: %sum - client tooling Version: 5.11 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-or-later URL: https://github.com/praiskup/resalloc BuildArch: noarch @@ -407,6 +407,9 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project %changelog +* Fri Sep 19 2025 Python Maint - 5.11-4 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 5.11-3 - Rebuilt for Python 3.14.0rc2 bytecode