cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Change some file listings to try and figure out which rpm macro is undefined

Browse source 
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
This commit is contained in:
Toshio Kuratomi 2019-02-07 17:04:28 -08:00
parent 8fd3591275
commit 0f130adf63
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packaging/rpm/ansible.spec
View file

@ -14,7 +14,7 @@ License: GPLv3+
Group: Development/Libraries Group: Development/Libraries
Source: https://releases.ansible.com/ansible/%{name}-%{upstream_version}.tar.gz Source: https://releases.ansible.com/ansible/%{name}-%{upstream_version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot 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())")} %{!?python_sitelib: %global python_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
BuildArch: noarch BuildArch: noarch
@ -124,7 +124,8 @@ rm -rf %{buildroot}
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{python_sitelib}/ansible* %{python_sitelib}/ansible/
%{python_sitelib}/ansible-*.egg-info
%{_bindir}/ansible* %{_bindir}/ansible*
%dir %{_datadir}/ansible %dir %{_datadir}/ansible
%config(noreplace) %{_sysconfdir}/ansible %config(noreplace) %{_sysconfdir}/ansible