import CS ansible-core-2.15.3-1.el8
This commit is contained in:
eabdullin
parent
d60867f284
commit
df01470253
|
|
@ -1,6 +1,8 @@
|
|||
560f248ccb0b98256c5b50c86a002c2c1e57edb6 SOURCES/Jinja2-3.1.2.tar.gz
|
||||
acb6dca5cbec84f4c707225a8b6b2505fae28c90 SOURCES/MarkupSafe-2.1.0.tar.gz
|
||||
b7e3b3c247a445c1986e5ec350b13bb1984a7207 SOURCES/ansible-core-2.14.2.tar.gz
|
||||
b99fa7af153646722b2d1817bb09906cc5a94bc6 SOURCES/packaging-20.4.tar.gz
|
||||
ca8d892c93fe2d54ea5e6f31c5798e40c58e8667 SOURCES/pyparsing-2.4.7.tar.gz
|
||||
ae564e766fc147e87d7f009d42b5204b7ae3a832 SOURCES/resolvelib-0.5.4.tar.gz
|
||||
192b9f6598e1ae036301f72781973c6f46e50aa2 SOURCES/MarkupSafe-2.1.2.tar.gz
|
||||
02fbb1496820e07068eeba988a02ca2626b296d2 SOURCES/ansible-core-2.15.3.tar.gz
|
||||
f220508f7a7e6f81422fe604035c56eb2532f383 SOURCES/ansible-documentation-2.15.3.tar.gz
|
||||
6e53dd117d09e6cd5d8596bf99a0dcbb202b8aad SOURCES/docutils-0.20.1.tar.gz
|
||||
b8caff3bec760723db6af4092c68075e22bdb769 SOURCES/packaging-21.3.tar.gz
|
||||
96464a9452e95e980c3a1fad1020fe00e29c0ae3 SOURCES/pyparsing-3.0.7.tar.gz
|
||||
2f587f4095bb70039c1d995635ae55af8eab08dc SOURCES/resolvelib-1.0.1.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
SOURCES/Jinja2-3.1.2.tar.gz
|
||||
SOURCES/MarkupSafe-2.1.0.tar.gz
|
||||
SOURCES/ansible-core-2.14.2.tar.gz
|
||||
SOURCES/packaging-20.4.tar.gz
|
||||
SOURCES/pyparsing-2.4.7.tar.gz
|
||||
SOURCES/resolvelib-0.5.4.tar.gz
|
||||
SOURCES/MarkupSafe-2.1.2.tar.gz
|
||||
SOURCES/ansible-core-2.15.3.tar.gz
|
||||
SOURCES/ansible-documentation-2.15.3.tar.gz
|
||||
SOURCES/docutils-0.20.1.tar.gz
|
||||
SOURCES/packaging-21.3.tar.gz
|
||||
SOURCES/pyparsing-3.0.7.tar.gz
|
||||
SOURCES/resolvelib-1.0.1.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/requirements.txt b/requirements.txt
|
||||
index 20562c3e0f..792daa209a 100644
|
||||
index a07aa98506..ef189d6594 100644
|
||||
--- a/requirements.txt
|
||||
+++ b/requirements.txt
|
||||
@@ -3,13 +3,5 @@
|
||||
@@ -3,16 +3,8 @@
|
||||
# packages. Thus, this should be the loosest set possible (only required
|
||||
# packages, not optional ones, and with the widest range of versions that could
|
||||
# be suitable)
|
||||
|
|
@ -10,9 +10,12 @@ index 20562c3e0f..792daa209a 100644
|
|||
PyYAML >= 5.1 # PyYAML 5.1 is required for Python 3.8+ support
|
||||
cryptography
|
||||
-packaging
|
||||
# importlib.resources in stdlib for py3.9 is lacking native hooks for
|
||||
# importlib.resources.files
|
||||
importlib_resources >= 5.0, < 5.1; python_version < '3.10'
|
||||
-# NOTE: resolvelib 0.x version bumps should be considered major/breaking
|
||||
-# NOTE: and we should update the upper cap with care, at least until 1.0
|
||||
-# NOTE: Ref: https://github.com/sarugaku/resolvelib/issues/69
|
||||
-# NOTE: When updating the upper bound, also update the latest version used
|
||||
-# NOTE: in the ansible-galaxy-collection test suite.
|
||||
-resolvelib >= 0.5.3, < 0.9.0 # dependency resolver used by ansible-galaxy
|
||||
-resolvelib >= 0.5.3, < 1.1.0 # dependency resolver used by ansible-galaxy
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
# Disable shebang munging for specific paths. These files are data files.
|
||||
# ansible-test munges the shebangs itself.
|
||||
%global __brp_mangle_shebangs_exclude_from_file %{SOURCE1}
|
||||
%global __brp_mangle_shebangs_exclude_from_file %{SOURCE2}
|
||||
|
||||
# NOTE(pabelanger): Don't auto add pwsh as Requires for ansible-test. We do
|
||||
# not wish to package it.
|
||||
|
|
@ -27,30 +27,35 @@
|
|||
%define vendor_pip %{__python3} -m pip install --no-deps -v --no-build-isolation --no-binary :all: -t %{vendor_path}
|
||||
|
||||
# These control which bundled dep versions we pin against
|
||||
%global docutils_version 0.20.1
|
||||
%global jinja2_version 3.1.2
|
||||
%global markupsafe_version 2.1.0
|
||||
%global packaging_version 20.4
|
||||
%global pyparsing_version 2.4.7
|
||||
%global resolvelib_version 0.5.4
|
||||
%global markupsafe_version 2.1.2
|
||||
%global packaging_version 21.3
|
||||
%global pyparsing_version 3.0.7
|
||||
%global resolvelib_version 1.0.1
|
||||
|
||||
|
||||
Name: ansible-core
|
||||
Summary: SSH-based configuration management, deployment, and task execution system
|
||||
Version: 2.14.2
|
||||
Release: 3%{?dist}
|
||||
Version: 2.15.3
|
||||
Release: 1%{?dist}
|
||||
ExcludeArch: i686
|
||||
|
||||
Group: Development/Libraries
|
||||
License: GPLv3+
|
||||
Source0: https://files.pythonhosted.org/packages/source/a/ansible-core/ansible-core-%{version}.tar.gz
|
||||
Source1: ansible-test-data-files.txt
|
||||
Source1: https://github.com/ansible/ansible-documentation/archive/v%{version}/ansible-documentation-%{version}.tar.gz
|
||||
Source2: ansible-test-data-files.txt
|
||||
|
||||
# And bundled deps
|
||||
Source2: https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-%{jinja2_version}.tar.gz
|
||||
Source3: https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-%{markupsafe_version}.tar.gz
|
||||
Source4: https://files.pythonhosted.org/packages/source/p/packaging/packaging-%{packaging_version}.tar.gz
|
||||
Source5: https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{pyparsing_version}.tar.gz
|
||||
Source6: https://files.pythonhosted.org/packages/source/r/resolvelib/resolvelib-%{resolvelib_version}.tar.gz
|
||||
Source3: https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-%{jinja2_version}.tar.gz
|
||||
Source4: https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-%{markupsafe_version}.tar.gz
|
||||
Source5: https://files.pythonhosted.org/packages/source/p/packaging/packaging-%{packaging_version}.tar.gz
|
||||
Source6: https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{pyparsing_version}.tar.gz
|
||||
Source7: https://files.pythonhosted.org/packages/source/r/resolvelib/resolvelib-%{resolvelib_version}.tar.gz
|
||||
|
||||
# Deps to build manpages
|
||||
Source8: https://sourceforge.net/projects/docutils/files/docutils/%{docutils_version}/docutils-%{docutils_version}.tar.gz
|
||||
|
||||
Patch0: remove-bundled-deps-from-requirements.patch
|
||||
|
||||
|
|
@ -88,7 +93,6 @@ BuildRequires: make git-core gcc
|
|||
Requires: git-core
|
||||
Requires: python%{python3_pkgversion}-PyYAML >= 5.1
|
||||
Requires: python%{python3_pkgversion}-cryptography
|
||||
Requires: python%{python3_pkgversion}-six
|
||||
Requires: sshpass
|
||||
|
||||
%description
|
||||
|
|
@ -113,7 +117,7 @@ This package installs the ansible-test command for testing modules and plugins
|
|||
developed for ansible.
|
||||
|
||||
%prep
|
||||
%setup -q -b2 -b3 -b4 -b5 -b6 -n ansible-core-%{version}
|
||||
%setup -q -b1 -b3 -b4 -b5 -b6 -b7 -b8 -n ansible-core-%{version}
|
||||
%patch0 -p1
|
||||
|
||||
# Fix all Python shebangs recursively in ansible-test
|
||||
|
|
@ -170,13 +174,20 @@ done
|
|||
mkdir -p %{buildroot}%{_sysconfdir}/ansible/
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/ansible/roles/
|
||||
|
||||
cp examples/hosts %{buildroot}%{_sysconfdir}/ansible/
|
||||
cp examples/ansible.cfg %{buildroot}%{_sysconfdir}/ansible/
|
||||
cp ../ansible-documentation-%{version}/examples/hosts %{buildroot}%{_sysconfdir}/ansible/
|
||||
cp ../ansible-documentation-%{version}/examples/ansible.cfg %{buildroot}%{_sysconfdir}/ansible/
|
||||
|
||||
mkdir -p %{buildroot}/%{_mandir}/man1/
|
||||
|
||||
mkdir -p docs/man/man1
|
||||
mkdir -p /tmp/_docutils
|
||||
%{__python3} -m pip install ../docutils-%{docutils_version} -t /tmp/_docutils --no-build-isolation
|
||||
PYTHONPATH=%{vendor_path}:/tmp/_docutils %{__python3} packaging/cli-doc/build.py man --output-dir docs/man/man1
|
||||
rm -rf /tmp/_docutils
|
||||
|
||||
cp -v docs/man/man1/*.1 %{buildroot}/%{_mandir}/man1/
|
||||
|
||||
cp -pr docs/docsite/rst .
|
||||
cp -pr ../ansible-documentation-%{version}/docs/docsite/rst .
|
||||
cp -p lib/ansible_core.egg-info/PKG-INFO .
|
||||
|
||||
strip --strip-unneeded %{vendor_path}/markupsafe/_speedups%{python3_ext_suffix}
|
||||
|
|
@ -186,7 +197,7 @@ strip --strip-unneeded %{vendor_path}/markupsafe/_speedups%{python3_ext_suffix}
|
|||
%{_bindir}/ansible*
|
||||
%exclude %{_bindir}/ansible-test
|
||||
%config(noreplace) %{_sysconfdir}/ansible/
|
||||
%doc README.rst PKG-INFO COPYING
|
||||
%doc README.md PKG-INFO COPYING
|
||||
%doc changelogs/CHANGELOG-v2.*.rst
|
||||
%doc %{_mandir}/man1/ansible*
|
||||
%{_datadir}/ansible/
|
||||
|
|
@ -199,6 +210,25 @@ strip --strip-unneeded %{vendor_path}/markupsafe/_speedups%{python3_ext_suffix}
|
|||
%{python3_sitelib}/ansible_test
|
||||
|
||||
%changelog
|
||||
* Wed Aug 16 2023 Dimitri Savineau <dsavinea@redhat.com> - 2.15.3-1
|
||||
- ansible-core 2.15.3 release (rhbz#2232431)
|
||||
- Use docs and examples from ansible-documentation project.
|
||||
- Build the manpages.
|
||||
|
||||
* Mon Aug 14 2023 Dimitri Savineau <dsavinea@redhat.com> - 2.15.2-1
|
||||
- ansible-core 2.15.2 release (rhbz#2231891)
|
||||
|
||||
* Tue Jul 04 2023 Dimitri Savineau <dsavinea@redhat.com> - 2.15.1-1
|
||||
- ansible-core 2.15.1 release (rhbz#2219620)
|
||||
|
||||
* Mon May 15 2023 Dimitri Savineau <dsavinea@redhat.com> - 2.15.0-1
|
||||
- ansible-core 2.15.0 release (rhbz#2204511)
|
||||
- update bundled markupsafe to 2.1.2.
|
||||
- update bundled packaging to 21.3.
|
||||
- update bundled pyparsing to 3.0.7.
|
||||
- update bundled resolvelib to 1.0.1.
|
||||
- remove six runtime dependency.
|
||||
|
||||
* Tue Feb 14 2023 Dimitri Savineau <dsavinea@redhat.com> - 2.14.2-3
|
||||
- rebuild with python 3.11 (rhbz#2169524)
|
||||
- remove bundled dependencies from requirements file (rhbz#2143974)
|
||||
|
|
|
|||
Loading…
Reference in New Issue