Compare commits

..

30 commits

Author SHA1 Message Date
Maxwell G
aaf7f039f5
Build for Python 3.9
ansible-core in RHEL 9.3 is going back to python3.9

(cherry picked from commit 330f77d3e2)

Relates: https://bugzilla.redhat.com/2221820
2023-11-07 02:11:03 +00:00
Maxwell G
a2076bfeed
Downgrade to 7.7.0.
(cherry picked from commit c48a055af8)
2023-11-07 02:11:02 +00:00
Maxwell G
b81600ed96
remove unused .coveragerc file
(cherry picked from commit fc81424050)
2023-11-07 02:11:01 +00:00
Maxwell G
20d967d0f5
Update to 8.0.0.
(cherry picked from commit 43d9344813)
2023-11-07 02:11:00 +00:00
Maxwell G
bd1a191033
add tmt and gating tests
(cherry picked from commit fb066e03ec)
2023-11-07 02:10:59 +00:00
Maxwell G
dd86b8e656
Update to 8.0.0~rc1.
(cherry picked from commit d5ea4542c9)
2023-11-07 02:10:58 +00:00
Maxwell G
6944aab305
update excluded files list for 8.0.0~b1
(cherry picked from commit c2e409cc77)
2023-11-07 02:10:57 +00:00
Maxwell G
a01dd00317
Update to 8.0.0~b1.
(cherry picked from commit 10f6b04abf)
2023-11-07 02:10:55 +00:00
Maxwell G
40c2c4fbef
add copyright headers
Fedora specfiles are implicitly licensed under the MIT license as per
the FPCA, but explicit is better than implicit.

(cherry picked from commit f489f343c7)
2023-11-07 02:10:54 +00:00
Maxwell G
5d170643ff
move specfile scripting into separate files
This makes the specfile more readable and makes it easier to sync the
more complex parts across branches.

This also refactors the license install logic.

(cherry picked from commit 282053d3e1)
2023-11-07 02:10:53 +00:00
Maxwell G
799e59087b
modernize specfile for EPEL 9 and Fedora
I'll maintain a separate specfile for EPEL 8.

(cherry picked from commit fccbd6ed03)
2023-11-07 02:10:51 +00:00
Maxwell G
4f00cd0cd4
Update to 8.0.0~a3.
(cherry picked from commit 58277e4f22)
2023-11-07 02:10:50 +00:00
Maxwell G
4c78ffade1
Update to 8.0.0~a2.
(cherry picked from commit 63070568b7)
2023-11-07 02:10:49 +00:00
Maxwell G
70164d320c
Update to 8.0.0~a1.
(cherry picked from commit 8a5fe04367)
2023-11-07 02:10:49 +00:00
Maxwell G
efc6953035
Update to 7.4.0.
(cherry picked from commit c4edd5fdca)
2023-11-07 02:10:48 +00:00
Maxwell G
8288c5424d
Update to 7.3.0.
(cherry picked from commit dafa29f748)
2023-11-07 02:10:47 +00:00
Maxwell G
a2bd69906f
simplify gitignore by using globs
(cherry picked from commit 0cd8ef9fba)
2023-11-07 02:10:45 +00:00
Maxwell G
8b3e6a6c25
Use more precise globs in %files 2023-05-09 14:16:41 +00:00
Maxwell G
a9d7c28806
Build for 3.11 on RHEL 8 and 9 2023-05-09 14:16:41 +00:00
Maxwell G
7a6b29deea
Add back specfile comment about find(1) syntax
This was accidentally removed at some point.
2023-05-09 14:16:40 +00:00
Maxwell G
30676986ca
Update to 7.2.0. 2023-05-09 14:16:40 +00:00
Maxwell G
4f667d7439
Update to 7.1.0. 2023-02-22 17:53:46 -06:00
Maxwell G
59ab1ad4de
Remove duplicate code 2023-02-02 15:51:22 -06:00
Maxwell G
9cffb313fb
Rebuild to fix epel9-next sorting issue 2022-12-12 09:37:51 -06:00
Maxwell G
8535fba3a0
Remove outdated comments 2022-11-19 15:18:08 -06:00
Maxwell G
fcd24a8988
Don't mangle cyberark/conjur/Jenkinsfile shebang
This file is removed later in the file, so there's no need to remove the
shebang.
2022-11-19 15:18:08 -06:00
Maxwell G
b93ba9e8c9
Update to 6.3.0 and spring cleaning.
- Stop duplicating docs and licenses.

- Don't remove tests in %%prep that are now handled by setup.py.

- Hardlink duplicated files and fix rpmlint errors

- Fixes: rhbz#2141351

- Move filelist %{buildsubdir} so it gets cleaned up

- Remove more unnecessary files

- Don't use `| tee /dev/stderr`

    This does not work properly in a mock chroot.

    Fixes: 6ebad0c

- Overhaul handling of shebangs

    * Don't mangle shebangs in roles' files and templates. This has the
      potential to cause issues with Ansible targets that have different
      filepaths than Fedora.
    * Remove %py3_shebang_fix. Ansible modules are not executable and
      don't need shebangs. Overriding them to /usr/bin/python3.9 has the
      potential to cause issues. Also, removing %py3_shebang_fix makes
      it easier to find development files that need to be removed.
      Upstream development scripts often have `/usr/bin/env python`
      shebangs, so brp-mangle-shebangs's warnings alert us to their
      presence.

- Use 'find|xargs' instead of 'find -exec'

    This takes up a fraction of the time, as it avoids spawning a bunch
    of sed processes.

- Relax version constraint

- Fixes: rhbz#2141351

- Use %py3_dist in %ansible_core_requires

    This ensures that ansible-core and ansible's Python versions match.
2022-11-19 15:18:08 -06:00
Kevin Fenzi
aded640ae5 Relax ansible-core dependency. 2022-11-13 14:37:10 -08:00
Maxwell G
b599d83174
Relax version constraint 2022-11-12 23:07:12 -06:00
Maxwell G
dfb2f215a7 Ensure correct version of ansible-core is available at buildtime.
Implement support for epel8.
2022-05-10 16:53:32 -05:00
4 changed files with 43 additions and 237 deletions

View file

@ -1,33 +0,0 @@
# See the documentation for more information:
# https://packit.dev/docs/configuration/
upstream_project_url: https://github.com/ansible-community/ansible-build-data
issue_repository: https://pagure.io/ansible-packit-issues
create_sync_note: false
upstream_tag_include: "11"
jobs:
- job: pull_from_upstream
trigger: release
dist_git_branches:
rawhide:
fast_forward_merge_into:
- fedora-43
- fedora-42
- job: koji_build
trigger: commit
dist_git_branches:
- rawhide
- fedora-43
- fedora-42
sidetag_group: "ansible"
dependencies:
- ansible-core
- job: bodhi_update
trigger: commit
dist_git_branches:
- rawhide
- fedora-43
- fedora-42
dependencies:
- ansible-core
sidetag_group: "ansible"

View file

@ -19,17 +19,24 @@ find ansible_collections -depth -regextype posix-egrep -regex "${hidden_pattern}
# Not needed for runtime
rm -rv ansible_collections/cisco/meraki/scripts/
rm -rv ansible_collections/community/digitalocean/scripts/
rm -rv ansible_collections/community/grafana/hacking/
rm -rv ansible_collections/community/okd/ci/
rm -rv ansible_collections/community/vmware/tools/
rm -rv ansible_collections/cyberark/conjur/ci/
rm -rv ansible_collections/cyberark/conjur/dev/
rm -rv ansible_collections/cyberark/conjur/roles/conjur_host_identity/tests/
rm -rv ansible_collections/google/cloud/scripts/
rm -rv ansible_collections/google/cloud/test-fixtures/
rm -rv ansible_collections/grafana/grafana/tools/
rm -rv ansible_collections/hetzner/hcloud/scripts/
rm -rv ansible_collections/google/cloud/scripts/
rm -rv ansible_collections/netbox/netbox/hacking/
rm -rv ansible_collections/sensu/sensu_go/docker/
rm -rv ansible_collections/sensu/sensu_go/tools/
rm -v ansible_collections/community/dns/update-docs-fragments.py
rm -v ansible_collections/community/dns/update-psl.sh
rm -v ansible_collections/community/mysql/run_all_tests.py
rm -v ansible_collections/community/routeros/update-docs.py
rm -v ansible_collections/cyberark/conjur/Jenkinsfile
rm -v ansible_collections/dellemc/enterprise_sonic/rebuild.sh
rm -v ansible_collections/ovirt/ovirt/build.sh
@ -40,6 +47,7 @@ find ansible_collections/cyberark/conjur -type f -name "*.pem" -print -delete
find -type f -name "*requirements.txt" -size 0 -print -delete
rm -v ansible_collections/community/zabbix/roles/zabbix_agent/files/win_sample/doSomething.ps1
rm -v ansible_collections/community/docker/meta/ee-bindep.txt
rm -vr ansible_collections/ibm/spectrum_virtualize/roles/place_holder
echo "[END] Delete unnecessary files and directories"

View file

@ -24,17 +24,15 @@
%global __brp_mangle_shebangs_exclude_from ^%{python3_sitelib}/ansible_collections/[^/]+/[^/]+/roles/[^/]+/(files|templates)/.*$
%global __requires_exclude_from %{?__requires_exclude_from:%__requires_exclude_from|}%{__brp_mangle_shebangs_exclude_from}
%if 0%{?rhel} >= 8
# ansible-core package is built against Python 3.11 in RHEL 8 and RHEL 9 which
# is not the default version.
%global python3_pkgversion 3.11
%endif
Name: ansible
Summary: Curated set of Ansible collections included in addition to ansible-core
Version: 13.1.0
%if %{defined el9}
# https://bugzilla.redhat.com/2221820 :(
Epoch: 1
%endif
Version: 7.7.0
%global uversion %{version_no_tilde %{quote:%nil}}
Release: 2%{?dist}
Release: 1%{?dist}
# In addition to GPL-3.0-or-later, the following licenses apply.
# License text that solely exists in file headers were not considered.
@ -57,12 +55,12 @@ License: GPL-3.0-or-later AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Claus
Source0: %{pypi_source %{name} %{uversion}}
Source1: ansible-prep.sh
Source2: ansible-install-licenses.sh
Url: https://ansible.com
BuildArch: noarch
BuildRequires: dos2unix
BuildRequires: findutils
BuildRequires: hardlink
BuildRequires: python%{python3_pkgversion}-devel
%if %{with tests}
@ -86,7 +84,7 @@ to ansible-core.
%prep
%autosetup -N -n %{name}-%{uversion}
%autosetup -p1 -n %{name}-%{uversion}
# Relax ansible-core dependency to avoid FTI bugs on EPEL
#
@ -97,12 +95,12 @@ to ansible-core.
# to properly release and test new ansible major versions after RHEL rebases
# ansible-core. The lower version constraints can stay in place.
sed "s|ansible-core ~=|ansible-core >=|" setup.cfg > setup.cfg.bak
sed "s|ansible-core ~=|ansible-core >=|" setup.py > setup.py.bak
# Verify
set -o pipefail
grep -B1 "ansible-core >=" setup.cfg.bak | grep -F 'install_requires ='
grep -B1 "ansible-core >=" setup.py.bak | grep -F 'install_requires=['
%if %{defined rhel}
mv setup.cfg.bak setup.cfg
mv setup.py.bak setup.py
%endif
# ansible-prep.sh
@ -138,6 +136,13 @@ mkdir -p %{buildroot}%{_licensedir}/ansible %{buildroot}%{_docdir}/ansible
mv licenses %{buildroot}%{_licensedir}/ansible/ansible_collections
mv docs %{buildroot}%{_pkgdocdir}/ansible_collections
hardlink -v %{buildroot}%{python3_sitelib}/ansible_collections
hardlink -v %{buildroot}%{_licensedir}/ansible
# XXX: One of the build steps is messing with the permission.
# XXX: The file is 0755 in the source tarball.
chmod 0755 %{buildroot}%{python3_sitelib}/ansible_collections/ngine_io/cloudstack/scripts/inventory/cloudstack.py
%check
%if %{with tests}
@ -148,7 +153,7 @@ mv docs %{buildroot}%{_pkgdocdir}/ansible_collections
%files
%license COPYING
%license %{_licensedir}/ansible/ansible_collections/
%doc README.rst PKG-INFO porting_guide_*.rst CHANGELOG-v*.rst
%doc README.rst PKG-INFO porting_guide_?.rst CHANGELOG-v?.rst
%doc %{_pkgdocdir}/ansible_collections/
%{_bindir}/ansible-community
# Note (dmsimard): This ansible package installs collections to the python sitelib to mirror the UX
@ -161,130 +166,10 @@ mv docs %{buildroot}%{_pkgdocdir}/ansible_collections
%changelog
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 13.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Tue Dec 09 2025 Maxwell G <maxwell@gtmx.me> - 13.1.0-1
- Update to 13.1.0. Fixes rhbz#2354912.
* Mon Nov 17 2025 Packit <hello@packit.dev> - 11.12.0-1
- Update to version 11.12.0
* Sat Sep 27 2025 Maxwell G <maxwell@gtmx.me> - 11.10.0-1
- Update to 11.10.0.
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 11.8.0-4
- Rebuilt for Python 3.14.0rc3 bytecode
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 11.8.0-3
- Rebuilt for Python 3.14.0rc2 bytecode
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 11.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Wed Jul 16 2025 Maxwell G <maxwell@gtmx.me> - 11.8.0-1
- Update to 11.8.0.
* Sat Jun 07 2025 Python Maint <python-maint@redhat.com> - 11.6.0-2
- Rebuilt for Python 3.14
* Sat Jun 07 2025 Maxwell G <maxwell@gtmx.me> - 11.6.0-1
- Update to 11.6.0.
* Tue Mar 25 2025 Packit <hello@packit.dev> - 11.4.0-1
- Update to version 11.4.0
- Resolves: rhbz#2354912
* Mon Mar 17 2025 Packit <hello@packit.dev> - 11.3.0-1
- Update to version 11.3.0
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 11.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Dec 18 2024 Maxwell G <maxwell@gtmx.me> - 11.1.0-1
- Update to 11.1.0.
* Tue Nov 26 2024 Maxwell G <maxwell@gtmx.me> - 11.0.0-1
- Update to 11.0.0.
* Fri Oct 11 2024 Maxwell G <maxwell@gtmx.me> - 9.11.0-1
- Update to 9.11.0.
* Tue Sep 10 2024 Maxwell G <maxwell@gtmx.me> - 9.10.0-1
- Update to 9.10.0.
* Tue Aug 13 2024 Maxwell G <maxwell@gtmx.me> - 9.9.0-1
- Update to 9.9.0.
* Fri Jul 19 2024 Maxwell G <maxwell@gtmx.me> - 9.8.0-1
- Update to 9.8.0.
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.7.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sun Jun 23 2024 Maxwell G <maxwell@gtmx.me> - 9.7.0-1
- Update to 9.7.0.
* Sun Jun 09 2024 Maxwell G <maxwell@gtmx.me> - 9.6.1-1
- Update to 8.6.1.
* Sun Jun 09 2024 Python Maint <python-maint@redhat.com> - 9.6.0-2
- Rebuilt for Python 3.13
* Tue Jun 04 2024 Maxwell G <maxwell@gtmx.me> - 9.6.0-1
- Update to 9.6.0.
* Thu May 02 2024 Maxwell G <maxwell@gtmx.me> - 9.5.1-1
- Update to 9.5.1.
* Fri Mar 29 2024 Maxwell G <maxwell@gtmx.me> - 9.4.0-1
- Update to 9.4.0.
* Sat Mar 02 2024 Maxwell G <maxwell@gtmx.me> - 9.3.0-1
- Update to 9.3.0.
- Backport "podman pod info" patch to containers.podman
* Thu Feb 01 2024 Maxwell G <maxwell@gtmx.me> - 9.2.0-1
- Update to 9.2.0.
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Dec 06 2023 Maxwell G <maxwell@gtmx.me> - 9.1.0-1
- Update to 9.1.0.
* Tue Nov 21 2023 Maxwell G <maxwell@gtmx.me> - 9.0.1-1
- Update to 9.0.1.
* Thu Oct 19 2023 Maxwell G <maxwell@gtmx.me> - 9.0.0~a3-1
- Update to 9.0.0~a3.
* Thu Oct 12 2023 Maxwell G <maxwell@gtmx.me> - 9.0.0~a2-1
- Update to 9.0.0~a2.
* Thu Sep 28 2023 Maxwell G <maxwell@gtmx.me> - 9.0.0~a1-1
- Update to 9.0.0~a1.
* Tue Sep 12 2023 Maxwell G <maxwell@gtmx.me> - 8.4.0-1
- Update to 8.4.0.
* Thu Aug 17 2023 Maxwell G <maxwell@gtmx.me> - 8.3.0-1
- Update to 8.3.0.
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Jul 03 2023 Maxwell G <maxwell@gtmx.me> - 8.1.0-2
- Rebuilt for Python 3.12
* Thu Jun 22 2023 Maxwell G <maxwell@gtmx.me> - 8.1.0-1
- Update to 8.1.0.
* Fri Jun 16 2023 Python Maint <python-maint@redhat.com> - 8.0.0-2
- Rebuilt for Python 3.12
* Tue Jul 18 2023 Maxwell G <maxwell@gtmx.me> - 1:7.7.0-1
- Downgrade to 7.7.0.
- Build for python3.9.
- Relates: rhbz#2221820
* Tue May 30 2023 Maxwell G <maxwell@gtmx.me> - 8.0.0-1
- Update to 8.0.0.
@ -310,82 +195,28 @@ mv docs %{buildroot}%{_pkgdocdir}/ansible_collections
* Wed Mar 01 2023 Maxwell G <maxwell@gtmx.me> - 7.3.0-1
- Update to 7.3.0.
* Tue Jan 31 2023 David Moreau-Simard <moi@dmsimard.com> - 7.2.0-1
* Fri Feb 10 2023 Maxwell G <gotmax@e.email> - 7.2.0-1
- Update to 7.2.0.
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Dec 09 2022 Maxwell G <gotmax@e.email> - 7.1.0-1
* Thu Feb 02 2023 Maxwell G <gotmax@e.email> - 7.1.0-1
- Update to 7.1.0.
* Wed Nov 23 2022 Maxwell G <gotmax@e.email> - 7.0.0-1
- Update to 7.0.0.
* Mon Dec 12 2022 Maxwell G <gotmax@e.email> - 6.3.0-2
- Rebuild to fix epel9-next sorting issue
* Fri Nov 18 2022 Maxwell G <gotmax@e.email> - 7.0.0~rc1-1
- Update to 7.0.0~rc1.
* Tue Nov 08 2022 Maxwell G <gotmax@e.email> - 7.0.0~b1-1
- Update to 7.0.0~b1.
* Fri Oct 28 2022 Maxwell G <gotmax@e.email> - 7.0.0~a2-1
- Update to 7.0.0~a2.
* Thu Oct 13 2022 Maxwell G <gotmax@e.email> - 6.5.0-1
- Update to 6.5.0.
* Thu Sep 15 2022 Maxwell G <gotmax@e.email> - 6.4.0-1
- Update to 6.4.0.
* Tue Aug 23 2022 Maxwell G <gotmax@e.email> - 6.3.0-1
* Thu Nov 17 2022 Maxwell G <gotmax@e.email> - 6.3.0-1
- Update to 6.3.0.
* Tue Aug 02 2022 Maxwell G <gotmax@e.email> - 6.2.0-1
- Update to 6.2.0.
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jul 15 2022 Maxwell G <gotmax@e.email> - 6.1.0-2
- Fix FTI (rhbz#2107532).
* Thu Jul 14 2022 Maxwell G <gotmax@e.email> - 6.1.0-1
- Update to 6.1.0.
* Wed Jun 22 2022 Maxwell G <gotmax@e.email> - 6.0.0-1
- Update to 6.0.0.
* Wed Jun 22 2022 Maxwell G <gotmax@e.email> - 6.0.0~rc1-1
- Update to 6.0.0~rc1.
- Stop duplicating docs and licenses.
- Don't remove tests in %%prep that are now handled by setup.py.
- Hardlink duplicated files and fix rpmlint errors
* Thu Jun 16 2022 Python Maint <python-maint@redhat.com> - 5.9.0-2
- Rebuilt for Python 3.11
* Sun Nov 13 2022 Kevin Fenzi <kevin@scrye.com> - 5.4.0-3
- Relax ansible-core dependency.
* Wed Jun 08 2022 Maxwell G <gotmax@e.email> - 5.9.0-1
- Update to 5.9.0.
* Thu May 19 2022 Maxwell G <gotmax@e.email> - 5.8.0-1
- Update to 5.8.0.
- Remove fortinet.fortios patch.
* Wed Apr 27 2022 Maxwell G <gotmax@e.email> - 5.7.0-1
- Update to 5.7.0.
- Fix SyntaxError in fortinet.fortios collection.
- Fix rpmlint errors
* Mon Apr 25 2022 Maxwell G <gotmax@e.email> - 5.6.0-2
* Mon Apr 25 2022 Maxwell G <gotmax@e.email> - 5.4.0-2
- Ensure correct version of ansible-core is available at buildtime.
- Implement support for epel8.
* Wed Apr 06 2022 Kevin Fenzi <kevin@scrye.com> - 5.6.0-1
- Update to 5.6.0.
* Tue Mar 15 2022 David Moreau-Simard <moi@dmsimard.com> - 5.5.0-1
- Update to latest upstream release
* Tue Feb 22 2022 David Moreau-Simard <moi@dmsimard.com> - 5.4.0-1
- Update to latest upstream release

View file

@ -1 +1 @@
SHA512 (ansible-13.1.0.tar.gz) = 2e7abd85b44d48ea756c65906811c9fa5519ce5d9ecaca71c718446a52dfc3dff97597d048f071ca820ea606ee2de670e8a0746717f95e2ce636db06273b3544
SHA512 (ansible-7.7.0.tar.gz) = 7da6845c9a68f2b8c10cf3e4cc6ea347861d5b59daa6ac895731ac79b733c6724d234345054fe9e3bf4ea460345b9026492fda42dce22bfbc027c9b4de093fd9