From 3f6d9c012be3be11d56815c7a5e9fa38782b9997 Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Thu, 6 Dec 2012 19:01:51 -0500 Subject: [PATCH] No longer removing shebang from .sh files Also we no longer keep a changlog in this file, to avoid confusion with upstream packaging --- spec/openstack-packstack.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/spec/openstack-packstack.spec b/spec/openstack-packstack.spec index e0d6b9cfb..c01897c73 100644 --- a/spec/openstack-packstack.spec +++ b/spec/openstack-packstack.spec @@ -37,7 +37,8 @@ apply puppet labs modules (https://github.com/puppetlabs/) # Sanitizing a lot of the files in the puppet modules, they come from seperate upstream projects find packstack/puppet/modules \( -name .fixtures.yml -o -name .gemfile -o -name ".travis.yml" -o -name .rspec \) -exec rm {} \; -find packstack/puppet/modules \( -name "*.py" -o -name "*.rb" -o -name "*.sh" -o -name "*.pl" \) -exec sed -i '/^#!/{d;q}' {} \; -exec chmod -x {} \; +find packstack/puppet/modules \( -name "*.py" -o -name "*.rb" -o -name "*.pl" \) -exec sed -i '/^#!/{d;q}' {} \; -exec chmod -x {} \; +find packstack/puppet/modules \( -name "*.sh" \) -exec sed -i 's/^#!.*/#!\/bin\/bash/g' {} \; -exec chmod +x {} \; find packstack/puppet/modules -name site.pp -size 0 -exec rm {} \; # Moving this data directory out temporarily as it causes setup.py to throw errors @@ -75,10 +76,6 @@ install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/ %changelog -* Fri Nov 30 2012 Derek Higgins - 2012.2.1-1dev197 -- cleaning up spec file -- updated to version 2012.2.1-1dev197 - -* Wed Nov 28 2012 Derek Higgins - 2012.2.1-1dev186 -- example packaging for Fedora / Redhat +* Thu Dec 06 2012 Derek Higgins +- Not keeping change log here, see downstream distributions for actual packaging