rpms/ansible-core
6
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Fix shebangs and update %%changelog.

Browse Source
This commit is contained in:
Maxwell G 2022-06-04 00:22:30 -05:00
parent a095f6f6fe
commit 940fba3cc1
No known key found for this signature in database
GPG Key ID: F79E4E25E8C661F8
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ansible-core.spec
View File

@ -64,9 +64,6 @@ Provides: bundled(python3dist(selectors2)) = 1.1.1
# Fedora-License-Identifier: Python # Fedora-License-Identifier: Python
Provides: bundled(python3dist(ipaddress)) = 1.0.22 Provides: bundled(python3dist(ipaddress)) = 1.0.22
#Provides: ansible = %%{version}-%%{release}
#Obsoletes: ansible <= 2.9.99
# For now conflict with the ansible 'classic' package.
Conflicts: ansible <= 2.9.99 Conflicts: ansible <= 2.9.99
# #
# obsoletes/provides for ansible-base # obsoletes/provides for ansible-base
@ -120,10 +117,7 @@ This package installs extensive documentation for ansible-core
%prep %prep
%autosetup -p1 %autosetup -p1
sed -i -s 's|/usr/bin/env python|%{__python3}|' test/lib/ansible_test/_util/target/cli/ansible_test_cli_stub.py bin/*
# disable the python -s shbang flag as we want to be able to find non system modules
%global py3_shbang_opts %(echo %{py3_shbang_opts} | sed 's/-s//')
%py3_shebang_fix .
%generate_buildrequires %generate_buildrequires
temp=$(mktemp) temp=$(mktemp)
@ -131,9 +125,6 @@ sed '/^mock$/d' test/lib/ansible_test/_data/requirements/units.txt > ${temp}
%pyproject_buildrequires %{?with_tests:${temp} test/units/requirements.txt} %{?with_docs:docs/docsite/requirements.txt} %pyproject_buildrequires %{?with_tests:${temp} test/units/requirements.txt} %{?with_docs:docs/docsite/requirements.txt}
%build %build
sed -i -s 's|/usr/bin/env python|%{__python3}|' test/lib/ansible_test/_util/target/cli/ansible_test_cli_stub.py bin/*
# Build manpages # Build manpages
make PYTHON=%{__python3} docs make PYTHON=%{__python3} docs
@ -226,9 +217,11 @@ make PYTHON=%{__python3} tests-py3
- Re-enable tests that work with newer pytest - Re-enable tests that work with newer pytest
- Patch out python3-mock - Patch out python3-mock
- Manually build manpages to workaround upstream issue. - Manually build manpages to workaround upstream issue.
- Remove unneeded BRs - Remove unneeded BRs and switch to pyproject-rpm-macros.
- Make ansible-base* Obsoletes/Provides compliant with Packaging Guidelines - Make ansible-base* Obsoletes/Provides compliant with Packaging Guidelines
- Remove python3-jmespath dependency. json_query is part of community.general. - Remove python3-jmespath dependency. json_query is part of community.general.
- Remove py3_shbang_opts now that all shebangs were removed from modules.
- Correct licensing
* Tue May 24 2022 Maxwell G <gotmax@e.email> - 2.12.6-1 * Tue May 24 2022 Maxwell G <gotmax@e.email> - 2.12.6-1
- Update to 2.12.6. - Update to 2.12.6.