[Ovirt-devel] [PATCH node-image] include manifests in ovirt-node-image RPM

[Alan Pevec]

Signed-off-by: Alan Pevec <apevec at redhat.com>
---
 ovirt-node-image.ks      |    3 ++-
 ovirt-node-image.spec.in |   18 ++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ovirt-node-image.ks b/ovirt-node-image.ks
index 0e441bd..39eed51 100644
--- a/ovirt-node-image.ks
+++ b/ovirt-node-image.ks
@@ -97,11 +97,12 @@ rel=$(rpm -q --qf '%{release}' ovirt-node)
 arch=$(rpm -q --qf '%{arch}' ovirt-node)
 echo "oVirt Node release $ver-$rel-$arch" > $manifests/ovirt-release
 tar -cvf ovirt-node-image-manifests-$ver-$rel.$arch.tar -C /tmp manifests
+ln -nf ovirt-node-image-manifests-$ver-$rel.$arch.tar ovirt-node-image-manifests.tar
 rm -Rf $manifests
 %end
 
 %post --nochroot
 # Move manifest tar to build directory
-mv $INSTALL_ROOT/ovirt-node-image-manifests-*.tar .
+mv $INSTALL_ROOT/ovirt-node-image-manifests*.tar .
 %end
 
diff --git a/ovirt-node-image.spec.in b/ovirt-node-image.spec.in
index d773086..4353c61 100644
--- a/ovirt-node-image.spec.in
+++ b/ovirt-node-image.spec.in
@@ -8,9 +8,12 @@ Release: 0%{?dist}%{?extra_release}
 Source0: %{name}-%{version}.tar.gz
 %if %{source_iso}
 Source1: %{name}.iso
+Source2: %{name}-manifests.tar
 %define image_iso %{SOURCE1}
+%define image_manifests %{SOURCE2}
 %else
 %define image_iso %{name}.iso
+%define image_manifests %{name}-manifests.tar
 %endif
 License: GPLv2+
 Group: Applications/System
@@ -64,6 +67,7 @@ mkdir %{buildroot}
 %{__install} -p -m0755 create-ovirt-iso-nodes %{buildroot}%{_sbindir}
 %{__install} -p -m0755 edit-livecd %{buildroot}%{_sbindir}
 %{__install} -p -m0755 livecd-setauth %{buildroot}%{_sbindir}
+%{__tar} -xf %{image_manifests} -C %{buildroot}%{app_root}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -75,9 +79,19 @@ ovirt-pxe %{name}.iso > /dev/null
 cobbler sync > /dev/null 2>&1 || :
 
 %files
-%defattr(-,root,root,0644)
+%defattr(0644,root,root,0755)
 %{app_root}/%{name}.iso
-%defattr(-,root,root,0755)
+%doc %{app_root}/manifests/rpm-manifest.txt
+%doc %{app_root}/manifests/srpm-manifest.txt
+%doc %{app_root}/manifests/file-manifest.txt
+%doc %{app_root}/manifests/dir-manifest.txt
+%doc %{app_root}/manifests/rpm-manifest-post.txt
+%doc %{app_root}/manifests/srpm-manifest-post.txt
+%doc %{app_root}/manifests/file-manifest-post.txt
+%doc %{app_root}/manifests/dir-manifest-post.txt
+%doc %{app_root}/manifests/ovirt-release
+
+%defattr(0755,root,root,0755)
 %{_sbindir}/ovirt-pxe
 %{_sbindir}/ovirt-flash
 %{_sbindir}/create-ovirt-iso-nodes
-- 
1.6.0.6