diff --git a/build-and-update-all-branches b/build-and-update-all-branches index e93f5d8..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 f40 f39 f38 epel7 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 db45191..7093616 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.5 -Release: 1%{?dist} +Version: 5.11 +Release: 4%{?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.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 + +* 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 + +* 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 + +* 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 + +* Thu Jan 16 2025 Jakub Kadlcik - 5.8-1 +- New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.8 + +* Fri Jan 10 2025 Jakub Kadlcik - 5.7-1 +- New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.7 + +* Mon Oct 07 2024 Pavel Raiskup - 5.6-1 +- New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.6 + +* Fri Jul 19 2024 Fedora Release Engineering - 5.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sun Jun 09 2024 Python Maint - 5.5-2 +- Rebuilt for Python 3.13 + * Wed Apr 24 2024 Pavel Raiskup - 5.5-1 - New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.5 diff --git a/sources b/sources index 30218a2..f458908 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (resalloc-5.5.tar.gz) = d555ab49825a238d6e06ab8feadb3dbac6bae5bede3b38aedcbf433001b9c9a2dfd27f6fadab7d3c9471ff1996e60e6a5124ef2da1ec51bf5d525244e30b71c7 +SHA512 (resalloc-5.11.tar.gz) = 73becebe671a59912006eb4b227c10f6ac7be91a91e94cff470ac6bb32eb4447ec905b1d151c5eeb54fdc6c2a6179f9b7d606bcf25c3f9caeb63bde171759ac3