diff --git a/.gitignore b/.gitignore index 2852964..be6d644 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /pyparsing-3.0.7.tar.gz /resolvelib-1.0.1.tar.gz /ansible-core-2.15.1.tar.gz +/ansible-core-2.14.7.tar.gz diff --git a/ansible-core.spec b/ansible-core.spec index e488cf2..ebb75c3 100644 --- a/ansible-core.spec +++ b/ansible-core.spec @@ -1,6 +1,3 @@ -%global __python3 /usr/bin/python3.11 -%global python3_pkgversion 3.11 - # We need this because we are no longer noarch, since our bundled deps might # conceivably need to compile arch-specific things. But we currently have no # useful debuginfo stuff. @@ -25,14 +22,12 @@ # These control which bundled dep versions we pin against %global jinja2_version 3.1.2 %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.15.1 +Epoch: 1 +Version: 2.14.7 Release: 1%{?dist} Group: Development/Libraries @@ -43,9 +38,6 @@ Source1: 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 Patch0: remove-bundled-deps-from-requirements.patch @@ -68,9 +60,6 @@ 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-resolvelib) = %{resolvelib_version} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-pip @@ -83,6 +72,9 @@ BuildRequires: make git-core gcc Requires: git-core Requires: python%{python3_pkgversion}-PyYAML >= 5.1 Requires: python%{python3_pkgversion}-cryptography +Requires: python%{python3_pkgversion}-packaging +Requires: python%{python3_pkgversion}-resolvelib >= 0.5.3 +Requires: python%{python3_pkgversion}-resolvelib < 0.9.0 Requires: sshpass %description @@ -94,7 +86,7 @@ are transferred to managed machines automatically. %package -n ansible-test Summary: Tool for testing ansible plugin and module code -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} %description -n ansible-test Ansible is a radically simple model-driven configuration management, @@ -107,7 +99,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 -b2 -b3 -n ansible-core-%{version} %patch0 -p1 # Fix all Python shebangs recursively in ansible-test @@ -122,10 +114,7 @@ developed for ansible. # Handle bundled deps: %{vendor_pip} \ ../Jinja2-%{jinja2_version}/ \ - ../MarkupSafe-%{markupsafe_version}/ \ - ../packaging-%{packaging_version}/ \ - ../pyparsing-%{pyparsing_version}/ \ - ../resolvelib-%{resolvelib_version} + ../MarkupSafe-%{markupsafe_version}/ # Create system directories that Ansible defines as default locations in # ansible/config/base.yml @@ -194,6 +183,11 @@ strip --strip-unneeded %{vendor_path}/markupsafe/_speedups%{python3_ext_suffix} %changelog +* Mon Jul 17 2023 Dimitri Savineau - 2.14.7-1 +- ansible-core 2.14.7 release (rhbz#2221820) +- rebuild with python 3.9 (rhbz#2221820) +- remove bundled packaging, pyparsing and resolvelib. + * Tue Jul 04 2023 Dimitri Savineau - 2.15.1-1 - ansible-core 2.15.1 release (rhbz#2219619) diff --git a/remove-bundled-deps-from-requirements.patch b/remove-bundled-deps-from-requirements.patch index 8000217..f5cf28f 100644 --- a/remove-bundled-deps-from-requirements.patch +++ b/remove-bundled-deps-from-requirements.patch @@ -1,21 +1,12 @@ diff --git a/requirements.txt b/requirements.txt -index a07aa98506..ef189d6594 100644 +index 20562c3e0f..b24f27b2ca 100644 --- a/requirements.txt +++ b/requirements.txt -@@ -3,16 +3,8 @@ +@@ -3,7 +3,6 @@ # 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) -jinja2 >= 3.0.0 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, < 1.1.0 # dependency resolver used by ansible-galaxy + packaging diff --git a/sources b/sources index d1495e3..cc70964 100644 --- a/sources +++ b/sources @@ -1,6 +1,3 @@ -SHA512 (ansible-core-2.15.1.tar.gz) = a0febdf13fbc70b8a4a5b670c8812fd8cbee7c02118f0087d453194d74f3b0c56b3659d9d763787c0d0e65bf82399f4ff00d355ec0243771986444f9880ee09e +SHA512 (ansible-core-2.14.7.tar.gz) = eb0223a40a2ec6b65a34e54dac77b5aa7b8efca8330c37dafa256bffbcc38862713f939edf85367cdbf14cddda36e96eef6931bf8b98de44f5739924cde8a15c SHA512 (Jinja2-3.1.2.tar.gz) = 5dfe122c1beef5305b34d25f22f96607bd3a6cba098b03091850ea36fefe62b645a7218d7584b35bea252393ac922c9bb3654a9e90f23bcfb273e811fcf2f2c1 SHA512 (MarkupSafe-2.1.2.tar.gz) = 84dbeddaf2df713b3cce94eb64876fea8f80c608e25130c18e4691be2b1dea56df8b772d26c0caca88231ef795125eb9678210c33bf20518c18e3047912ddb4b -SHA512 (packaging-21.3.tar.gz) = 2e3aa276a4229ac7dc0654d586799473ced9761a83aa4159660d37ae1a2a8f30e987248dd0e260e2834106b589f259a57ce9936eef0dcc3c430a99ac6b663e05 -SHA512 (pyparsing-3.0.7.tar.gz) = 1e692f4cdaa6b6e8ca2729d0a3e2ba16d978f1957c538b6de3a4220ec7d996bdbe87c41c43abab851fffa3b0498a05841373e435602917b8c095042e273badb5 -SHA512 (resolvelib-1.0.1.tar.gz) = 52c872fb2a22c47de022a661dc4d8de8c6af450f1cff6f2b99cd91bf7eccae5b6ee223793f50b9679c1c6caedbd8bb63330915ee6f10533b1a0ed239d068b36f