diff options
| author | Toshio Kuratomi <a.badger@gmail.com> | 2019-02-07 17:04:28 -0800 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2019-02-07 17:58:38 -0800 |
| commit | 0f130adf633d9723322efc1af1071bcc1a08574f (patch) | |
| tree | c96091593ea880e20cd2d484591d98b337b84dc5 /packaging | |
| parent | 8fd3591275a0e1dbb824b6491f5918b5819df4f8 (diff) | |
| download | ansible-0f130adf633d9723322efc1af1071bcc1a08574f.tar.gz | |
Change some file listings to try and figure out which rpm macro is undefined
One of the file path macros that we use in the rpm file list isn't being
defined on Fedora 29 in Jenkins which is causing it to fail to build
there. Change the potential problems so that we can tell which file
entry is causing the failures on its next rebuild
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/rpm/ansible.spec | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec index 8b0c103a16..dae1dc541b 100644 --- a/packaging/rpm/ansible.spec +++ b/packaging/rpm/ansible.spec @@ -14,7 +14,7 @@ License: GPLv3+ Group: Development/Libraries Source: https://releases.ansible.com/ansible/%{name}-%{upstream_version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -%{!?__python2: %global __python2 /usr/bin/python2.6} +%{!?__python2: %global __python2 /usr/bin/python2.7} %{!?python_sitelib: %global python_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} BuildArch: noarch @@ -124,7 +124,8 @@ rm -rf %{buildroot} %files %defattr(-,root,root) -%{python_sitelib}/ansible* +%{python_sitelib}/ansible/ +%{python_sitelib}/ansible-*.egg-info %{_bindir}/ansible* %dir %{_datadir}/ansible %config(noreplace) %{_sysconfdir}/ansible |