From ae23759f52ec6d5a0787aeab0bcdc5b3e0cdfc5a Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 21 Sep 2023 18:02:14 +0000 Subject: [PATCH] import CS ansible-core-2.14.9-1.el9 --- .ansible-core.metadata | 8 +- .gitignore | 8 +- ...emove-bundled-deps-from-requirements.patch | 12 +-- SPECS/ansible-core.spec | 78 ++++++++++++------- 4 files changed, 57 insertions(+), 49 deletions(-) diff --git a/.ansible-core.metadata b/.ansible-core.metadata index 0d8afab..bdfd2cd 100644 --- a/.ansible-core.metadata +++ b/.ansible-core.metadata @@ -1,6 +1,4 @@ 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 +206d3558bef217b0d3cd20a10bd55b00d8b61f43 SOURCES/ansible-core-2.14.9.tar.gz +366ad8407df71776813faeff935da35d65967b33 SOURCES/ansible-documentation-2.14.9.tar.gz diff --git a/.gitignore b/.gitignore index 2d79bb0..1970e84 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ 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.14.9.tar.gz +SOURCES/ansible-documentation-2.14.9.tar.gz diff --git a/SOURCES/remove-bundled-deps-from-requirements.patch b/SOURCES/remove-bundled-deps-from-requirements.patch index 9e6b433..f5cf28f 100644 --- a/SOURCES/remove-bundled-deps-from-requirements.patch +++ b/SOURCES/remove-bundled-deps-from-requirements.patch @@ -1,18 +1,12 @@ diff --git a/requirements.txt b/requirements.txt -index 20562c3e0f..792daa209a 100644 +index 20562c3e0f..b24f27b2ca 100644 --- a/requirements.txt +++ b/requirements.txt -@@ -3,13 +3,5 @@ +@@ -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 --# 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 + packaging diff --git a/SPECS/ansible-core.spec b/SPECS/ansible-core.spec index f23381e..b865ebd 100644 --- a/SPECS/ansible-core.spec +++ b/SPECS/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. @@ -8,7 +5,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} # RHEL and Fedora add -s to the shebang line. We do *not* use -s -E -S or -I # with ansible because it has many optional features which users need to @@ -24,28 +21,24 @@ # These control which bundled dep versions we pin against %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 Name: ansible-core Summary: SSH-based configuration management, deployment, and task execution system -Version: 2.14.2 -Release: 4%{?dist} +Epoch: 1 +Version: 2.14.9 +Release: 1%{?dist} 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 Patch0: remove-bundled-deps-from-requirements.patch @@ -68,11 +61,9 @@ 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}-docutils BuildRequires: python%{python3_pkgversion}-pip BuildRequires: python%{python3_pkgversion}-pyyaml BuildRequires: python%{python3_pkgversion}-rpm-macros @@ -83,7 +74,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}-six +Requires: python%{python3_pkgversion}-packaging +Requires: python%{python3_pkgversion}-resolvelib >= 0.5.3 +Requires: python%{python3_pkgversion}-resolvelib < 0.9.0 Requires: sshpass %description @@ -95,7 +88,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, @@ -108,7 +101,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 -n ansible-core-%{version} %patch0 -p1 # Fix all Python shebangs recursively in ansible-test @@ -123,10 +116,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 @@ -165,13 +155,17 @@ 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 +PYTHONPATH=%{vendor_path} %{__python3} packaging/cli-doc/build.py man --output-dir docs/man/man1 + 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} @@ -181,7 +175,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/ @@ -195,6 +189,30 @@ strip --strip-unneeded %{vendor_path}/markupsafe/_speedups%{python3_ext_suffix} %changelog +* Wed Aug 16 2023 Dimitri Savineau - 1:2.14.9-1 +- ansible-core 2.14.9 release (rhbz#2232432) +- Use docs and examples from ansible-documentation project. +- Build the manpages. + +* Mon Aug 14 2023 Dimitri Savineau - 1:2.14.8-1 +- ansible-core 2.14.8 release (rhbz#2231892) + +* Mon Jul 17 2023 Dimitri Savineau - 1: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) + +* Mon May 15 2023 Dimitri Savineau - 2.15.0-1 +- ansible-core 2.15.0 release (rhbz#2204510) +- 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. + * Mon Feb 13 2023 Dimitri Savineau - 2.14.2-4 - rebuild with python 3.11 (rhbz#2169466) - remove bundled dependencies from requirements file (rhbz#2152615)