ansible-core 2.13.1
Ansible 2.13 requires jinja2 >= 3.0.0 but isn't available as RPM package. This jinja2 version also depends on markupsafe >= 2.0 which also isn't available. This adds bundled version of jinja2 and markupsafe with the ansible-core package. Resolves: #2100242 Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
This commit is contained in:
Dimitri Savineau
parent
e9d14fff8d
commit
e2feb3ff33
3
.gitignore
vendored
3
.gitignore
vendored
@ -13,3 +13,6 @@
|
||||
/ansible-b104478f171a4030c0cd96ef4d99db65bf04dceb.tar.gz
|
||||
/ansible-a1683d3dab164afdfe1bedc8dab296564b7a47e5.tar.gz
|
||||
/ansible-fbaea4c269b0a3c8112101754cee808d82bebbee.tar.gz
|
||||
/ansible-e9f633ec720fbd4367d2f694574dec101e22d3b9.tar.gz
|
||||
/jinja2-2a48dd898d72f1a119ee923996e70aa43da04ea4.tar.gz
|
||||
/markupsafe-b5a517506d6cb8091e215a4a89e47db5eee6a68f.tar.gz
|
||||
|
||||
@ -7,7 +7,10 @@
|
||||
# ansible-test munges the shebangs itself.
|
||||
%global __brp_mangle_shebangs_exclude_from_file %{SOURCE1}
|
||||
|
||||
%global commitId fbaea4c269b0a3c8112101754cee808d82bebbee
|
||||
# Filter requires on jinja2 since bundled
|
||||
%global __requires_exclude jinja2
|
||||
|
||||
%global commitId e9f633ec720fbd4367d2f694574dec101e22d3b9
|
||||
%global python39_sitelib /usr/lib/python3.9/site-packages/
|
||||
|
||||
# RHEL and Fedora add -s to the shebang line. We do *not* use -s -E -S or -I
|
||||
@ -23,6 +26,8 @@
|
||||
%define vendor_pip /usr/bin/python3.9 -m pip install --no-deps -v --no-use-pep517 --no-binary :all: -t %{vendor_path}
|
||||
|
||||
# These control which bundled dep versions we pin against
|
||||
%global jinja2_version 3.0.3
|
||||
%global markupsafe_version 2.1.0
|
||||
%global packaging_version 20.4
|
||||
%global pyparsing_version 2.4.7
|
||||
%global straightplugin_version 1.4.1
|
||||
@ -30,7 +35,7 @@
|
||||
|
||||
Name: ansible-core
|
||||
Summary: SSH-based configuration management, deployment, and task execution system
|
||||
Version: 2.12.7
|
||||
Version: 2.13.1
|
||||
Release: 1%{?dist}
|
||||
|
||||
Group: Development/Libraries
|
||||
@ -39,11 +44,13 @@ Source0: ansible-%{commitId}.tar.gz
|
||||
Source1: ansible-test-data-files.txt
|
||||
|
||||
# And bundled deps
|
||||
Source2: packaging-ded06cedf6e20680eea0363fac894cb4a09e7831.tar.gz
|
||||
Source3: pyparsing-6a844ee35ca5125490a28dbd6dd2d15b6498e605.tar.gz
|
||||
Source2: jinja2-2a48dd898d72f1a119ee923996e70aa43da04ea4.tar.gz
|
||||
Source3: markupsafe-b5a517506d6cb8091e215a4a89e47db5eee6a68f.tar.gz
|
||||
Source4: packaging-ded06cedf6e20680eea0363fac894cb4a09e7831.tar.gz
|
||||
Source5: pyparsing-6a844ee35ca5125490a28dbd6dd2d15b6498e605.tar.gz
|
||||
|
||||
# Deps to build man pages
|
||||
Source5: straightplugin-6634ea8e1e89d5bb23804f50e676f196c52c46ed.tar.gz
|
||||
Source6: straightplugin-6634ea8e1e89d5bb23804f50e676f196c52c46ed.tar.gz
|
||||
|
||||
URL: http://ansible.com
|
||||
|
||||
@ -57,32 +64,32 @@ Obsoletes: ansible-base
|
||||
|
||||
# Bundled provides that are sprinkled throughout the codebase.
|
||||
Provides: bundled(python-backports-ssl_match_hostname) = 3.7.0.1
|
||||
Provides: bundled(python-distro) = 1.5.0
|
||||
Provides: bundled(python-distro) = 1.6.0
|
||||
Provides: bundled(python-selectors2) = 1.1.1
|
||||
Provides: bundled(python-six) = 1.13.0
|
||||
Provides: bundled(python-six) = 1.16.0
|
||||
|
||||
# Things we explicitly bundle via src rpm, and put in ansible._vendor
|
||||
Provides: bundled(python-jinja2) = %{jinja2_version}
|
||||
Provides: bundled(python-markupsafe) = %{markupsafe_version}
|
||||
Provides: bundled(python-packaging) = %{packaging_version}
|
||||
Provides: bundled(python-pyparsing) = %{pyparsing_version}
|
||||
Provides: bundled(python-straightplugin) = %{straightplugin_version}
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-docutils
|
||||
BuildRequires: python3-jinja2
|
||||
BuildRequires: python3-pip
|
||||
BuildRequires: python3-pyyaml
|
||||
BuildRequires: python3-resolvelib
|
||||
BuildRequires: python3-rpm-macros
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-wheel
|
||||
BuildRequires: make git-core
|
||||
BuildRequires: make git-core gcc
|
||||
|
||||
Requires: git-core
|
||||
Requires: python3
|
||||
Requires: python3-jinja2
|
||||
Requires: python3-PyYAML
|
||||
Requires: python3-PyYAML >= 5.1
|
||||
Requires: python3-cryptography
|
||||
Requires: python3-resolvelib
|
||||
Requires: python3-resolvelib >= 0.5.3
|
||||
Requires: python3-six
|
||||
Requires: sshpass
|
||||
|
||||
@ -108,9 +115,11 @@ This package installs the ansible-test command for testing modules and plugins
|
||||
developed for ansible.
|
||||
|
||||
%prep
|
||||
%setup -q -T -b 2 -n packaging-ded06cedf6e20680eea0363fac894cb4a09e7831
|
||||
%setup -q -T -b 3 -n pyparsing-6a844ee35ca5125490a28dbd6dd2d15b6498e605
|
||||
%setup -q -T -b 5 -n straightplugin-6634ea8e1e89d5bb23804f50e676f196c52c46ed
|
||||
%setup -q -T -b 2 -n jinja2-2a48dd898d72f1a119ee923996e70aa43da04ea4
|
||||
%setup -q -T -b 3 -n markupsafe-b5a517506d6cb8091e215a4a89e47db5eee6a68f
|
||||
%setup -q -T -b 4 -n packaging-ded06cedf6e20680eea0363fac894cb4a09e7831
|
||||
%setup -q -T -b 5 -n pyparsing-6a844ee35ca5125490a28dbd6dd2d15b6498e605
|
||||
%setup -q -T -b 6 -n straightplugin-6634ea8e1e89d5bb23804f50e676f196c52c46ed
|
||||
%setup -q -n ansible-%{commitId}
|
||||
|
||||
%build
|
||||
@ -121,8 +130,10 @@ developed for ansible.
|
||||
|
||||
# Handle bundled deps:
|
||||
%{vendor_pip} \
|
||||
../pyparsing-6a844ee35ca5125490a28dbd6dd2d15b6498e605/ \
|
||||
../packaging-ded06cedf6e20680eea0363fac894cb4a09e7831/
|
||||
../jinja2-2a48dd898d72f1a119ee923996e70aa43da04ea4/ \
|
||||
../markupsafe-b5a517506d6cb8091e215a4a89e47db5eee6a68f/ \
|
||||
../packaging-ded06cedf6e20680eea0363fac894cb4a09e7831/ \
|
||||
../pyparsing-6a844ee35ca5125490a28dbd6dd2d15b6498e605/
|
||||
|
||||
# Create system directories that Ansible defines as default locations in
|
||||
# ansible/config/base.yml
|
||||
@ -189,12 +200,17 @@ cp -p lib/ansible_core.egg-info/PKG-INFO .
|
||||
%{_datadir}/ansible/
|
||||
%{python39_sitelib}/ansible*
|
||||
%exclude %{python39_sitelib}/ansible_test
|
||||
%exclude %{python39_sitelib}/ansible/_vendor/markupsafe/_speedups.c
|
||||
|
||||
%files -n ansible-test
|
||||
%{_bindir}/ansible-test
|
||||
%{python39_sitelib}/ansible_test
|
||||
|
||||
%changelog
|
||||
* Wed Jun 22 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.13.1-1
|
||||
- ansible-core 2.13.1 release (rhbz#2100242)
|
||||
- add bundled version of jinja2 and markupsafe
|
||||
|
||||
* Mon Jun 20 2022 Dimitri Savineau <dsavinea@redhat.com> - 2.12.7-1
|
||||
- ansible-core 2.12.7 release (rhbz#2099317)
|
||||
- remove legacy nightly configuration
|
||||
|
||||
4
sources
4
sources
@ -1,4 +1,6 @@
|
||||
SHA512 (ansible-fbaea4c269b0a3c8112101754cee808d82bebbee.tar.gz) = e1d99360f40c7a5279f9e91193e56f04ba45dcc63e3f5c8a2d55f0c902e007e6dfc1b850b7ff76db2fbb0ea561c0242f3cde486e5fe7dd0f20165c3a56fd93b1
|
||||
SHA512 (ansible-e9f633ec720fbd4367d2f694574dec101e22d3b9.tar.gz) = 25dc5b2eb17f35a5f1d6c564fdd39c97cd2fcc77a01ce23aa82c77f8aa296924c42ec59a4e5ccc22d3e7820dce143e88b44d71ab6d8322fa61648ba7ac5b4e7b
|
||||
SHA512 (jinja2-2a48dd898d72f1a119ee923996e70aa43da04ea4.tar.gz) = d77e907fa4128cf540f597ee662efea236cc90b66c4d1374cc24c35c5b49c97a3a66de0fa1416323ebcf0bef765d5d79c770b73d61004780fbbe9dd088c28305
|
||||
SHA512 (markupsafe-b5a517506d6cb8091e215a4a89e47db5eee6a68f.tar.gz) = 5f454607c2d4eb0eab46305696636341a6725cc03ebde170c592f49a79b84fd51d1be82e0c22023772fda1dee09d2ae4f5867d189e2f0bdc1a0246962367fd08
|
||||
SHA512 (packaging-ded06cedf6e20680eea0363fac894cb4a09e7831.tar.gz) = ceacb927289775fe901b2169053e3265db1531c8c22dc42329d28c24b64d021a791cf523044420e3a821fbbc251039796f951b21745a4870a8ec53e2eeac76a7
|
||||
SHA512 (pyparsing-6a844ee35ca5125490a28dbd6dd2d15b6498e605.tar.gz) = ad95ec904f35dce422e31c6fc5922ca5970757229463e9fc4d1cbb0e798b6b7c1c6f44dcb8aaccec47f106506e78e7482ffc40b21f2122ba9d83e4e27bd57118
|
||||
SHA512 (straightplugin-6634ea8e1e89d5bb23804f50e676f196c52c46ed.tar.gz) = 7a3ba87f0de4cd7c7c8dda564d737b1656f8f3a9fa33895a252dec49ed53cbaf7e140d7fa65a68efa959487f4477b079cf9ae8cd251df3b8977053cde8aab7a5
|
||||
|
||||
Loading…
Reference in New Issue
Block a user