From 41327e9d78f0f808136f1db42c374e9b11884fd4 Mon Sep 17 00:00:00 2001
From: Alexander Tsamutali <atsamutali@mirantis.com>
Date: Wed, 24 Aug 2016 21:53:27 +0300
Subject: [PATCH] Cleanup %files section in spec

Don't use --record during install, don't use -f in %files. Specify
nailgun files/directories explicitly.

Change-Id: Ib4adc96fdea1987de08f67ff934a7fa35258f4d1
Closes-Bug: #1614926
---
 specs/fuel-nailgun.spec | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/specs/fuel-nailgun.spec b/specs/fuel-nailgun.spec
index 759fc9ef76..23843fb384 100644
--- a/specs/fuel-nailgun.spec
+++ b/specs/fuel-nailgun.spec
@@ -85,7 +85,7 @@ getent group $GROUPNAME >/dev/null || groupadd -r $GROUPNAME
 getent passwd $USERNAME >/dev/null || useradd -r -g $GROUPNAME -G $GROUPNAME -r -s /sbin/nologin -c "Nailgun Daemon" $USERNAME
 
 %install
-cd %{_builddir}/%{name}-%{version}/nailgun && python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=%{_builddir}/%{name}-%{version}/nailgun/INSTALLED_FILES
+cd %{_builddir}/%{name}-%{version}/nailgun && python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT
 mkdir -p %{buildroot}/opt/nailgun/bin
 mkdir -p %{buildroot}/%{_sysconfdir}/cron.d
 mkdir -p %{buildroot}/%{_sysconfdir}/fuel
@@ -105,14 +105,16 @@ install -D -m644 %{_builddir}/%{name}-%{version}/systemd/*.service %{buildroot}/
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{_builddir}/%{name}-%{version}/nailgun/INSTALLED_FILES
+%files
+%defattr(-, root, root)
+%license LICENSE
+%doc README.md
 %config(noreplace) %attr(-, nailgun, nailgun) %{_sysconfdir}/nailgun/settings.yaml
-%dir %attr(0755,nailgun,root) %{_localstatedir}/log/nailgun
-%defattr(0755,root,root)
-
-%if %{defined _unitdir}
-%attr(0644, root, root) /%{_unitdir}/*
-%endif
+%dir %attr(-, nailgun, root) %{_localstatedir}/log/nailgun
+%{_bindir}/*
+%{python2_sitelib}/nailgun
+%{python2_sitelib}/*.egg-info
+%{_unitdir}/*
 
 
 %package -n fuel-openstack-metadata
@@ -128,8 +130,8 @@ URL:       http://github.com/Mirantis
 This package currently installs just a single file openstack.yaml
 
 %files -n fuel-openstack-metadata
-%defattr(-,root,root)
-%{_datadir}/fuel-openstack-metadata/*
+%defattr(-, root, root)
+%{_datadir}/fuel-openstack-metadata
 %{_sysconfdir}/fuel_openstack_version
 
 %package -n fencing-agent
@@ -145,6 +147,6 @@ Requires:  rubygem-ohai
 Fuel fencing agent
 
 %files -n fencing-agent
+%defattr(-, root, root)
 /opt/nailgun/bin/fencing-agent.rb
 /etc/cron.d/fencing-agent
-%defattr(-,root,root)