[PATCH] Correct %files section of imagefactory.spec.in
Added imgfac.1.gz to rpm
Added COPYING to rpm
Added version.txt to rpm
Fixed unowned dirs
Set proper config setting for config file
Signed-off-by: Steven Dake <sdake(a)redhat.com>
---
MANIFEST.in | 2 +-
imagefactory.spec.in | 17 ++++++++++++++---
setup.py | 2 +-
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/MANIFEST.in b/MANIFEST.in
index 72f0efc..1ee119c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1 @@
-include cert-ec2.pem imagefactory.conf scripts/imagefactory
+include COPYING Documentation/man/imgfac.1 cert-ec2.pem imagefactory.conf
scripts/imagefactory
diff --git a/imagefactory.spec.in b/imagefactory.spec.in
index b71bbf6..d672ca1 100644
--- a/imagefactory.spec.in
+++ b/imagefactory.spec.in
@@ -37,13 +37,24 @@ for the requested target.
python setup.py build
%install
-python setup.py install -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
+%{__rm} -rf $RPM_BUILD_ROOT
+python setup.py install -O1 --root=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f INSTALLED_FILES
-%defattr(-,root,root)
+%files
+%defattr(-,root,root,-)
+%doc COPYING version.txt
+%{_initrddir}/imagefactory
+%config(noreplace) %{_sysconfdir}/imagefactory.conf
+%dir %attr(0755, root, root) %{_sysconfdir}/pki/imagefactory/
+%{_sysconfdir}/pki/imagefactory/cert-ec2.pem
+%dir %attr(0755, root, root) %{python_sitelib}/imagefactory/
+%{python_sitelib}/imagefactory/*
+%{python_sitelib}/imagefactory-*.egg-info
+%{_bindir}/imgfac.py
+%{_mandir}/man1/*
%changelog
* Mon Apr 04 2011 Chris Lalancette <clalance(a)redhat.com> - 0.1.6-1
diff --git a/setup.py b/setup.py
index f73ed8e..b54b5d5 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ try:
except Exception, e:
raise RuntimeError("ERROR: version.txt could not be found. Run 'git
describe > version.txt' to get the correct version info.")
-datafiles=[('/etc', ['imagefactory.conf']),
('/etc/pki/imagefactory', ['cert-ec2.pem']),
('/etc/rc.d/init.d', ['scripts/imagefactory']), ('',
['version.txt'])]
+datafiles=[('share/man/man1', ['Documentation/man/imgfac.1']),
('/etc', ['imagefactory.conf']), ('/etc/pki/imagefactory',
['cert-ec2.pem']), ('/etc/rc.d/init.d',
['scripts/imagefactory'])]
class sdist(_sdist):
""" custom sdist command to prepare imagefactory.spec file
"""
--
1.7.4.4