automatic import of resallocopeneuler20.03

1 files changed, 14 insertions, 303 deletions

diff --git a/resalloc.spec b/resalloc.spec
index 0f14562..936171e 100644
--- a/resalloc.spec
+++ b/resalloc.spec
@@ -11,27 +11,11 @@ The resalloc project aims to help with taking care of dynamically \
 allocated resources, for example ephemeral virtual machines used for \
 the purposes of CI/CD tasks.
 
-%if 0%{?openEuler}
-%bcond_without check
-%else
-%bcond_with check
-%endif
-
-%if 0%{?fedora} || 0%{?rhel} > 7 || 0%{?is_opensuse} || 0%{?openEuler}
-%bcond_with    python2
-%bcond_without python3
-%else
-%bcond_without python2
-%bcond_with    python3
-%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:    4.9
-Release:    2%{?dist}
+Release:    1 
 License:    GPL-2.0-or-later
 URL:        https://github.com/praiskup/resalloc
 BuildArch:  noarch
@@ -40,7 +24,6 @@ BuildRequires: make
 BuildRequires: postgresql-server
 
 
-%if %{with python3}
 BuildRequires: python3-alembic
 BuildRequires: python3-argparse-manpage
 BuildRequires: python3-devel
@@ -50,31 +33,9 @@ BuildRequires: python3-pytest-cov
 BuildRequires: python3-setuptools
 BuildRequires: python3-six
 BuildRequires: python3-sqlalchemy
-%if 0%{?is_opensuse}
-BuildRequires: python3-PyYAML
-BuildRequires: cron
-%elif 0%{?openEuler}
 BuildRequires: python3-pyyaml
-%else
-BuildRequires: python3-yaml
-%endif
-%endif
-
-%if %{with python2}
-BuildRequires: python-alembic
-BuildRequires: python2-argparse-manpage
-BuildRequires: python2-devel
-BuildRequires: python-psycopg2
-BuildRequires: python2-mock
-BuildRequires: python2-pytest
-BuildRequires: python2-pytest-cov
-BuildRequires: python2-setuptools
-BuildRequires: python2-six
-BuildRequires: python-sqlalchemy
-BuildRequires: python-yaml
-%endif
-
-Requires:   %default_python-%srcname = %version-%release
+
+Requires:   python3-%srcname = %version-%release
 
 Source0: https://github.com/praiskup/%name/releases/download/v%version/%name-%version.tar.gz
 Source1: resalloc.service
@@ -93,18 +54,11 @@ Summary:    %sum - server part
 
 Requires: crontabs
 Requires: logrotate
-Requires:   %default_python-%srcname = %version-%release
-%if %{with python3}
+Requires: python3-%srcname = %version-%release
 Requires: python3-alembic
 Requires: python3-six
 Requires: python3-sqlalchemy
 Requires: python3-yaml
-%else
-Requires: python-alembic
-Requires: python2-six
-Requires: python-sqlalchemy
-Requires: python-yaml
-%endif
 
 Requires(pre): /usr/sbin/useradd
 %description server
@@ -113,25 +67,20 @@ Requires(pre): /usr/sbin/useradd
 The %name-server package provides the resalloc server, and
 some tooling for resalloc administrators.
 
-%if %{with python3}
 %package webui
 Summary:    %sum - webui part
 
-%if %{with python3}
-Requires:   %default_python-%srcname = %version-%release
+Requires: python3-%srcname = %version-%release
 Requires: %name-server
 Requires: python3-flask
 Recommends: %name-selinux
-%endif
 
 %description webui
 %desc
 
 The %name-webui package provides the resalloc webui,
 it shows page with information about resalloc resources.
-%endif
 
-%if %{with python3}
 %package -n python3-%srcname
 Summary: %sum - Python 3 client library
 %{?python_provide:%python_provide python3-%srcname}
@@ -140,19 +89,6 @@ Summary: %sum - Python 3 client library
 
 The python3-%name package provides Python 3 client library for talking
 to the resalloc server.
-%endif
-
-
-%if %{with python2}
-%package -n python2-%srcname
-Summary: %sum - Python 2 client library
-%{?python_provide:%python_provide python2-%srcname}
-%description -n python2-%srcname
-%desc
-
-The python2-%name package provides Python 2 client library for talking
-to the resalloc server.
-%endif
 
 
 %package selinux
@@ -176,18 +112,10 @@ restorecon -R %_var/www/cgi-%{name} || :
 
 
 %build
-%if %{with python2}
-%py2_build
-%else
 %py3_build
-%endif
 
 
 %install
-%if %{with python2}
-%py2_install
-rm -r %buildroot%python2_sitelib/%{name}webui
-%else
 %py3_install
 install -d -m 755 %buildroot%_datadir/%{name}webui
 cp -r %{name}webui/templates %buildroot%_datadir/%{name}webui/
@@ -195,7 +123,6 @@ cp -r %{name}webui/static %buildroot%_datadir/%{name}webui/
 
 install -d -m 755 %buildroot%_var/www/
 install -p -m 755 %{name}webui/cgi-resalloc %buildroot%_var/www/cgi-%{name}
-%endif
 
 mkdir -p %buildroot%_unitdir
 mkdir -p %buildroot%_logdir
@@ -209,19 +136,14 @@ install -p -m 755 %SOURCE3 %buildroot/%_libexecdir/%name-merge-hook-logs
 install -d %buildroot%_sysconfdir/cron.hourly
 install -p -m 755 %SOURCE4 %buildroot%_sysconfdir/cron.hourly/resalloc
 
-
-%if %{with check}
-%check
-%if %{with python2}
-make check TEST_PYTHONS="python2"
-%else
-make check TEST_PYTHONS="python3"
-%endif
-%endif
+# for now EUR call mock by root user, just skip check
+# need re-enable check when builder run as non-root user
+#%check
+#make check TEST_PYTHONS="python3"
 
 
 # Simplify "alembic upgrade head" actions.
-ln -s "%{default_sitelib}/%{name}server" %buildroot%_homedir/project
+ln -s "%{python3_sitelib}/%{name}server" %buildroot%_homedir/project
 
 
 %pre server
@@ -250,28 +172,17 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \
 %_mandir/man1/%{name}.1*
 
 
-%if %{with python3}
 %files -n python3-%srcname
 %doc %doc_files
 %license COPYING
 %{python3_sitelib}/%{name}
 %{python3_sitelib}/%{name}-*.egg-info
-%endif
-
-
-%if %{with python2}
-%files -n python2-%srcname
-%doc %doc_files
-%license COPYING
-%{python2_sitelib}/%{name}
-%{python2_sitelib}/%{name}-*.egg-info
-%endif
 
 
 %files server
 %doc %doc_files
 %license COPYING
-%{default_sitelib}/%{name}server
+%{python3_sitelib}/%{name}server
 %{_bindir}/%{name}-server
 %{_bindir}/%{name}-maint
 %{_bindir}/%{name}-check-vm-ip
@@ -286,216 +197,16 @@ useradd -r -g "$group" -G "$group" -s /bin/bash \
 %_libexecdir/resalloc-merge-hook-logs
 %config %attr(0755, root, root) %{_sysconfdir}/cron.hourly/resalloc
 
-%if %{with python3}
 %files webui
 %doc %doc_files
 %license COPYING
-%{default_sitelib}/%{name}webui/
+%{python3_sitelib}/%{name}webui/
 %_datadir/%{name}webui/
 %_var/www/cgi-%{name}
-%endif
 
 %files selinux
 
 
 %changelog
-* Mon Jan 30 2023 Miro Hrončok <mhroncok@redhat.com> - 4.9-2
-- Rebuilt to change Python shebangs to /usr/bin/python3.6 on EPEL 8
-
-* Mon Jan 23 2023 Pavel Raiskup <praiskup@redhat.com> - 4.9-1
-- new upstream release https://github.com/praiskup/resalloc/releases/tag/v4.9
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Sep 23 2022 Pavel Raiskup <praiskup@redhat.com> - 4.8-1
-- new upstream release:
-  https://github.com/praiskup/resalloc/releases/tag/v4.8
-
-* Tue Sep 20 2022 Pavel Raiskup <praiskup@redhat.com> - 4.7-1
-- new upstream release:
-  https://github.com/praiskup/resalloc/releases/tag/v4.7
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jun 29 2022 Jakub Kadlcik <frostyx@email.cz> - 4.6-2
-- Add resalloc-selinux subpackage
-
-* Wed Jun 29 2022 Jakub Kadlcik <frostyx@email.cz> - 4.6-1
-- New upstream version:
-  https://github.com/praiskup/resalloc/releases/tag/v4.6
-
-* Thu Jun 23 2022 Pavel Raiskup <praiskup@redhat.com> - 4.5-1
-- New upstream version:
-  https://github.com/praiskup/resalloc/releases/tag/v4.5
-
-* Wed Jun 22 2022 Jakub Kadlcik <python-maint@redhat.com> - 4.4-1
-- New upstream version:
-  https://github.com/praiskup/resalloc/releases/tag/v4.4
-
-* Tue Jun 14 2022 Python Maint <python-maint@redhat.com> - 4.3-2
-- Rebuilt for Python 3.11
-
-* Thu Jan 20 2022 Pavel Raiskup <praiskup@redhat.com> - 4.3-1
-- new upstream release:
-  https://github.com/praiskup/resalloc/releases/tag/v4.3
-
-* Thu Jan 20 2022 Pavel Raiskup <praiskup@redhat.com> - 4.2-1
-- new upstream release:
-  https://github.com/praiskup/resalloc/releases/tag/v4.2
-
-* Tue Aug 24 2021 Pavel Raiskup <praiskup@redhat.com> - 4.1-1
-- bugfix release, with prioritized released resources again
-
-* Mon Aug 23 2021 Pavel Raiskup <praiskup@redhat.com> - 4-1
-- new release, with tag-priority
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jun 22 2021 Pavel Raiskup <praiskup@redhat.com> - 3.7-1
-- new upstream release, see NEWS file
-
-* Wed Jun 09 2021 Pavel Raiskup <praiskup@redhat.com> - 3.6-1
-- rebase to a new version having DB performance fixes
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3.4-3
-- Rebuilt for Python 3.10
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.4-2
-- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* Fri Feb 19 2021 Silvie Chlupova <schlupov@redhat.com> - 3.4-1
-- New upstream release v3.4
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jun 25 2020 Pavel Raiskup <praiskup@redhat.com> - 3.3-1
-- new release, mostly fixing one bug causing traceback on too-long stdout output
-  from AllocWorker script
-
-* Tue Jun 02 2020 Pavel Raiskup <praiskup@redhat.com> - 3.2-1
-- new configuration option cmd_release - command to be run before we mark the
-  resource as reusable again
-- after server restart, schedule all inconsistent resources to be terminated
-  (mitigates issue#41)
-- systemd service is restarted upon failure (just in case)
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.1-2
-- Rebuilt for Python 3.9
-
-* Tue May 26 2020 Pavel Raiskup <praiskup@redhat.com> - 3.1-1
-- new version v3.1, improved resource checker
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.0-2
-- Rebuilt for Python 3.9
-
-* Sun May 17 2020 Pavel Raiskup <praiskup@redhat.com> - 3.0-1
-- new 3.0 version - new possibility to re-use resources, and client requests can
-  survive server restarts
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2.6-3
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.6-2
-- Rebuilt for Python 3.8
-
-* Fri Aug 02 2019 Pavel Raiskup <praiskup@redhat.com> - 2.6-1
-- don't assign resources to closed tickets
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jun 13 2019 Pavel Raiskup <praiskup@redhat.com> - 2.5-1
-- thread safety - don't change os.environ
-
-* Tue Jun 11 2019 Pavel Raiskup <praiskup@redhat.com> - 2.4-1
-- fix improperly handled thread communication
-
-* Fri May 10 2019 Pavel Raiskup <praiskup@redhat.com> - 2.3-3
-- drop mkhomedir requires leftover
-- configure logrotate to compress rotated logs
-
-* Fri May 10 2019 Pavel Raiskup <praiskup@redhat.com> - 2.3-2
-- fix logrotate typo s/lib/log/, package it as config file
-
-* Fri May 10 2019 Pavel Raiskup <praiskup@redhat.com> - 2.3-1
-- logrotate config (per review rhbz#1707302)
-- provide manual page for resalloc-server (per rhbz#1707302)
-- logrotate also the hooks directory
-
-* Fri May 10 2019 Pavel Raiskup <praiskup@redhat.com> - 2.2-2
-- move homedir from /home to /var/lib (per msuchy's review)
-
-* Thu May 09 2019 Pavel Raiskup <praiskup@redhat.com> - 2.2-1
-- new release
-
-* Tue May 07 2019 Pavel Raiskup <praiskup@redhat.com> - 2.1-3
-- provide summary/description (per msuchy's review)
-
-* Tue May 07 2019 Pavel Raiskup <praiskup@redhat.com> - 2.1-2
-- only support Python 3 or Python 2
-
-* Tue May 07 2019 Pavel Raiskup <praiskup@redhat.com> - 2.1-1
-- fixed racy testsuite
-
-* Tue May 07 2019 Pavel Raiskup <praiskup@redhat.com> - 2.0-1
-- release 2.0 (changed db schema for "id" within pool)
-
-* Wed Oct 31 2018 Pavel Raiskup <praiskup@redhat.com> - 1.1-1
-- bump, rebuild for Python 3.7
-
-* Tue Jan 30 2018 Pavel Raiskup <praiskup@redhat.com> - 1.1-0
-- release with removed 'cat' hack (commit 970b99725acf1dc)
-
-* Thu Jan 18 2018 Pavel Raiskup <praiskup@redhat.com> - 0.1-12
-- first release
-
-* Wed Jan 17 2018 Pavel Raiskup <praiskup@redhat.com> - 0.dev0-12
-- better setup default directories
-
-* Wed Jan 17 2018 Pavel Raiskup <praiskup@redhat.com> - 0.dev0-11
-- log both stdout and stderr for start/stop/livecheck commands
-
-* Sat Jan 06 2018 Pavel Raiskup <praiskup@redhat.com> - 0.dev0-10
-- service: add WantedBy=multi-user.target
-
-* Fri Sep 29 2017 Pavel Raiskup <praiskup@redhat.com> - 0.dev0-9
-- fix homedir for ansible
-
-* Fri Sep 29 2017 Pavel Raiskup <praiskup@redhat.com> - 0.dev0-8
-- resalloc-maint resource-delete fix
-
-* Thu Sep 28 2017 Pavel Raiskup <praiskup@redhat.com> - 0.dev0-7
-- resalloc ticket-wait puts output to stdout
-- new command resalloc-maint ticket-list
-
-* Tue Sep 26 2017 Pavel Raiskup <praiskup@redhat.com> - 0.dev0-6
-- create datadir directory for database files
-
-* Tue Sep 26 2017 Pavel Raiskup <praiskup@redhat.com> - 0.dev0-5
-- install manual pages
-- add '--with check' option
-
-* Thu Sep 21 2017 Pavel Raiskup <praiskup@redhat.com> - 0.dev0-4
-- python2/python3 fixes
-
-* Wed Sep 20 2017 Pavel Raiskup <praiskup@redhat.com> - 0.dev0-3
-- resalloc user is not nologin anymore
-- add resalloc-maint
-
-* Tue Sep 19 2017 Pavel Raiskup <praiskup@redhat.com> - 0.dev0-2
-- add service file
-- install log directory for server
-
-* Mon Sep 18 2017 Pavel Raiskup <praiskup@redhat.com>
-- no changelog
+* Tue Mar 21 2023 lichaoran <pkwarcraft@hotmail.comm> - 4.91
+- init package