From 71d58edf8c62de4b54e5fbf313c633a8fcf28843 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sat, 11 Jun 2022 08:11:11 +0000 Subject: [PATCH] Auto sync2gitlab import of ansible-core-2.12.6-3.el8.src.rpm --- ansible-core.spec | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/ansible-core.spec b/ansible-core.spec index 870bfc3..c4d7ce7 100644 --- a/ansible-core.spec +++ b/ansible-core.spec @@ -35,7 +35,7 @@ Name: ansible-core Summary: SSH-based configuration management, deployment, and task execution system Version: 2.12.6 -Release: 2%{?dist} +Release: 3%{?dist} ExcludeArch: i686 Group: Development/Libraries @@ -71,8 +71,8 @@ Provides: bundled(python-packaging) = %{packaging_version} Provides: bundled(python-pyparsing) = %{pyparsing_version} Provides: bundled(python-straightplugin) = %{straightplugin_version} +BuildRequires: python3-docutils BuildRequires: python38-devel -# BuildRequires: python38-docutils BuildRequires: python38-jinja2 BuildRequires: python38-pip BuildRequires: python38-pyyaml @@ -80,6 +80,7 @@ BuildRequires: python38-resolvelib BuildRequires: python38-rpm-macros BuildRequires: python38-setuptools BuildRequires: python38-wheel +BuildRequires: make git-core Requires: git-core Requires: python38 @@ -175,17 +176,17 @@ cp examples/hosts %{buildroot}%{_sysconfdir}/ansible/ cp examples/ansible.cfg %{buildroot}%{_sysconfdir}/ansible/ mkdir -p %{buildroot}/%{_mandir}/man1/ ## Build man pages -# -#mkdir /tmp/_vendor -#/usr/bin/python3.8 -m pip install ../straightplugin-6634ea8e1e89d5bb23804f50e676f196c52c46ed -t /tmp/_vendor --no-build-isolation -# -## Remove plugins not needed, they bring in more dependencies -#find hacking/build_library/build_ansible/command_plugins ! -name 'generate_man.py' -type f -exec rm -f {} + -# -#PYTHON=python3.8 PYTHONPATH=%{vendor_path}:/tmp/_vendor make docs -#cp -v docs/man/man1/*.1 %{buildroot}/%{_mandir}/man1/ -# -#cp -pr docs/docsite/rst . + +mkdir /tmp/_vendor +/usr/bin/python3.8 -m pip install ../straightplugin-6634ea8e1e89d5bb23804f50e676f196c52c46ed -t /tmp/_vendor --no-build-isolation + +# Remove plugins not needed, they bring in more dependencies +find hacking/build_library/build_ansible/command_plugins ! -name 'generate_man.py' -type f -exec rm -f {} + + +PYTHON=python3.8 PYTHONPATH=%{vendor_path}:/tmp/_vendor make docs +cp -v docs/man/man1/*.1 %{buildroot}/%{_mandir}/man1/ + +cp -pr docs/docsite/rst . cp -p lib/ansible_core.egg-info/PKG-INFO . %files @@ -195,7 +196,7 @@ cp -p lib/ansible_core.egg-info/PKG-INFO . %config(noreplace) %{_sysconfdir}/ansible/ %doc README.rst PKG-INFO COPYING %doc changelogs/CHANGELOG-v2.*.rst -# %doc %{_mandir}/man1/ansible* +%doc %{_mandir}/man1/ansible* %{_datadir}/ansible/ %{python38_sitelib}/ansible* %exclude %{python38_sitelib}/ansible_test @@ -205,6 +206,10 @@ cp -p lib/ansible_core.egg-info/PKG-INFO . %{python38_sitelib}/ansible_test %changelog +* Thu Jun 09 2022 Dimitri Savineau - 2.12.6-3 +- Build manpages (rhbz#2032809) +- Remove legacy files + * Tue Jun 07 2022 Dimitri Savineau - 2.12.6-2 - switch from git to git-core dependency (rhbz#2094549)