cleaning up tarball and spec file

.git need to be in MANIFEST.in twice
some versions of git add .git for submodules as a file
and in others its a directory

removing some of the files in the puppet modules
during rpm build

packstack/installer/run_setup.py is no longer runable
This commit is contained in:
Derek Higgins 2012-11-30 05:25:58 -05:00
parent 7c70f10ee5
commit 8db2f17862
3 changed files with 18 additions and 6 deletions

View File

@ -1,5 +1,8 @@
include docs/*
include LICENSE
recursive-include packstack/puppet *
recursive-include packstack/templates *
global-exclude .gitignore
global-exclude .gitmodules
global-exclude .git
prune packstack/puppet/modules/*/.git

2
packstack/installer/run_setup.py Executable file → Normal file
View File

@ -1,5 +1,3 @@
#!/usr/bin/python
import ConfigParser
import copy
import getpass

View File

@ -7,6 +7,7 @@ Version: 2012.2.1
Release: 1dev%{git_revno}%{?dist}
Summary: Openstack Install Utility
Group: Applications/System
License: ASL 2.0
URL: https://github.com/fedora-openstack/packstack
#Source0: https://github.com/downloads/fedora-openstack/packstack/packstack-%{version}.tar.gz
@ -34,11 +35,16 @@ apply puppetlabs modules (https://github.com/puppetlabs/)
#%setup -n packstack-%{version}
%setup -n packstack-%{version}dev%{git_revno}
%build
# 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 site.pp -size 0 -exec rm {} \;
# Moving this data directory out temporarily as it causes setup.py to throw errors
rm -rf %{_builddir}/puppet
mv packstack/puppet %{_builddir}/puppet
%build
# puppet on fedora already has this module, using this one causes problems
%if 0%{?fedora}
rm -rf %{_builddir}/puppet/modules/create_resources
@ -61,6 +67,7 @@ mkdir -p %{buildroot}%{_mandir}/man1
install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
%files
%doc LICENSE
%{_bindir}/packstack
%{python_sitelib}/packstack
%{python_sitelib}/packstack-%{version}*.egg-info
@ -68,6 +75,10 @@ install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
%changelog
* Fri Nov 30 2012 Derek Higgins <derekh@redhat.com> - 2012.2.1-1dev197
- cleaning up spec file
- updated to version 2012.2.1-1dev197
* Wed Nov 28 2012 Derek Higgins <derekh@redhat.com> - 2012.2.1-1dev186
- example packaging for Fedora / Redhat