From 0f130adf633d9723322efc1af1071bcc1a08574f Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Thu, 7 Feb 2019 17:04:28 -0800 Subject: [PATCH] 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 --- packaging/rpm/ansible.spec | 5 +++-- 1 file 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