Compare commits

...
Sign in to create a new pull request.

7 commits

Author SHA1 Message Date
Python Maint
c46cbb5e81 Rebuilt for Python 3.14.0rc3 bytecode 2025-09-19 14:53:02 +02:00
Python Maint
bd93fdb44c Rebuilt for Python 3.14.0rc2 bytecode 2025-08-15 15:15:37 +02:00
Fedora Release Engineering
9b7713aa1f Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 11:54:41 +00:00
Pavel Raiskup
6c799be7e5 Forgotten changelog entry 2025-07-21 15:37:35 +02:00
Pavel Raiskup
e065fd3c64 New upstream release
https://github.com/praiskup/resalloc/releases/tag/v5.11
2025-07-21 15:29:22 +02:00
Pavel Raiskup
2758a25936 New upstream release
Version: 5.10-1
2025-06-12 13:12:32 +02:00
Python Maint
0e203a5774 Rebuilt for Python 3.14 2025-06-05 08:12:25 +02:00
3 changed files with 67 additions and 16 deletions

View file

@ -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

View file

@ -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: 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 <<EOF
u resalloc - '%sysuser service user' %_homedir /bin/bash
m resalloc %sysgroup
EOF
cat >resalloc-agent-spawner.sysusers.conf <<EOF
u resalloc-agent-spawner - '%agent_user service user' - -
m resalloc-agent-spawner %agent_group
EOF
%build
%if %{with python2}
@ -266,6 +290,9 @@ rm %buildroot%_bindir/%name-agent-*
rm %buildroot%_sysconfdir/resalloc-agent-spawner/config.yaml
%endif
install -m0644 -D resalloc.sysusers.conf %{buildroot}%{_sysusersdir}/resalloc.conf
install -m0644 -D resalloc-agent-spawner.sysusers.conf %{buildroot}%{_sysusersdir}/resalloc-agent-spawner.conf
%if %{with check}
%check
@ -281,8 +308,10 @@ make check TEST_PYTHONS="python3"
ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project
%if %{with sysusers_compat}
%pre server
%create_user_group %sysuser %sysgroup /bin/bash %_homedir
%endif
%post server
%systemd_post resalloc.service
@ -292,8 +321,10 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project
%if %{with python3}
%if %{with sysusers_compat}
%pre agent-spawner
%create_user_group %agent_user %agent_group /bin/false /
%endif
%post agent-spawner
%systemd_post resalloc-agent-spawner.service
@ -346,6 +377,7 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project
%config %_sysconfdir/logrotate.d/resalloc-server
%_libexecdir/resalloc-merge-hook-logs
%config %attr(0755, root, root) %{_sysconfdir}/cron.hourly/resalloc
%{_sysusersdir}/resalloc.conf
%files helpers
@ -361,6 +393,7 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project
%{default_sitelib}/%{name}_agent_spawner
%_unitdir/resalloc-agent-spawner.service
%config(noreplace) %_sysconfdir/resalloc-agent-spawner
%{_sysusersdir}/resalloc-agent-spawner.conf
%files webui
%doc %doc_files
@ -374,6 +407,26 @@ ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project
%changelog
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 5.11-4
- Rebuilt for Python 3.14.0rc3 bytecode
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 5.11-3
- Rebuilt for Python 3.14.0rc2 bytecode
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Mon Jul 21 2025 Pavel Raiskup <praiskup@redhat.com> - 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 <praiskup@redhat.com> - 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 <python-maint@redhat.com> - 5.9-2
- Rebuilt for Python 3.14
* Sat Jan 18 2025 Pavel Raiskup <praiskup@redhat.com> - 5.9-1
- New upstream release https://github.com/praiskup/resalloc/releases/tag/v5.9

View file

@ -1 +1 @@
SHA512 (resalloc-5.9.tar.gz) = 270c7a5d080fd8a2bfaddafb6f220e3749e70367494f6e10861bebf1c5a8f93d965ec1393b3baec1037591dec15a1769a4d29132b1f340259fa60e4d8143d4dc
SHA512 (resalloc-5.11.tar.gz) = 73becebe671a59912006eb4b227c10f6ac7be91a91e94cff470ac6bb32eb4447ec905b1d151c5eeb54fdc6c2a6179f9b7d606bcf25c3f9caeb63bde171759ac3