From 8e54817f50d2a9587aa6507e978c496e303c656b Mon Sep 17 00:00:00 2001 From: Ton Kersten Date: Mon, 29 Apr 2013 19:24:41 +0200 Subject: [PATCH] Squashed commit of the following: commit c1f92093c8fa985c35d2fbcbb9171d82842983dd Author: Ton Kersten Date: Mon Apr 29 19:23:42 2013 +0200 Fixed RPM building for 1.2 --- packaging/rpm/ansible.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec index 348e2f4261b..fc9b3bedeb6 100644 --- a/packaging/rpm/ansible.spec +++ b/packaging/rpm/ansible.spec @@ -86,7 +86,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir}/{man1,man3}/ cp -v docs/man/man1/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1/ cp -v docs/man/man3/*.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ansible -cp -v library/* $RPM_BUILD_ROOT/%{_datadir}/ansible/ +cp -rv library/* $RPM_BUILD_ROOT/%{_datadir}/ansible/ %clean rm -rf $RPM_BUILD_ROOT @@ -96,9 +96,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/ansible* %{_bindir}/ansible* %dir %{_datadir}/ansible -%{_datadir}/ansible/[a-eg-z]* -%{_datadir}/ansible/f[a-hj-z]* -%{_datadir}/ansible/file +%{_datadir}/ansible/*/[a-eg-z]* +%{_datadir}/ansible/*/f[a-hj-z]* +%{_datadir}/ansible/*/file %config(noreplace) %{_sysconfdir}/ansible %doc README.md PKG-INFO COPYING %doc %{_mandir}/man1/ansible* @@ -108,7 +108,7 @@ rm -rf $RPM_BUILD_ROOT %doc examples/playbooks %files fireball -%{_datadir}/ansible/fireball +%{_datadir}/ansible/utilities/fireball %doc %{_mandir}/man3/ansible.fireball.* %files node-fireball