[Ovirt-devel] [PATCH 2/4] modified spec file for inclusion in Fedora

[David Huff]

---
 ovirt-node-image.spec.in |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ovirt-node-image.spec.in b/ovirt-node-image.spec.in
index 1f8c31b..e5ef318 100644
--- a/ovirt-node-image.spec.in
+++ b/ovirt-node-image.spec.in
@@ -23,6 +23,7 @@ URL: http://ovirt.org/
 BuildRequires: livecd-tools >= 020-2
 BuildRequires: appliance-tools >= 003.9
 %endif
+BuildRequires: ovirt-node-tools 
 Requires: livecd-tools >= 020-2

 %define app_root %{_datadir}/%{name}
@@ -63,11 +64,11 @@ mkdir %{buildroot}
 %{__install} -d -m0755 %{buildroot}%{app_root}
 %{__install} -p -m0644 %{image_iso} %{buildroot}%{app_root}
 %{__install} -d -m0755 %{buildroot}%{_sbindir}
-%{__install} -p -m0755 create-ovirt-iso-nodes %{buildroot}%{_sbindir}
-%{__install} -p -m0755 edit-livecd %{buildroot}%{_sbindir}
-%{__install} -p -m0755 livecd-iso-to-iscsi %{buildroot}%{_sbindir}
-%{__install} -p -m0755 livecd-setauth %{buildroot}%{_sbindir}
-%{__install} -p -m0755 livecd-rpms %{buildroot}%{_sbindir}
+#%{__install} -p -m0755 create-ovirt-iso-nodes %{buildroot}%{_sbindir}
+#%{__install} -p -m0755 edit-livecd %{buildroot}%{_sbindir}
+#%{__install} -p -m0755 livecd-iso-to-iscsi %{buildroot}%{_sbindir}
+#%{__install} -p -m0755 livecd-setauth %{buildroot}%{_sbindir}
+#%{__install} -p -m0755 livecd-rpms %{buildroot}%{_sbindir}
 %{__tar} -xf %{image_manifests} -C %{buildroot}%{app_root}

 %clean
@@ -93,11 +94,11 @@ cobbler sync > /dev/null 2>&1 || :
 %doc %{app_root}/manifests/ovirt-release

 %defattr(0755,root,root,0755)
-%{_sbindir}/create-ovirt-iso-nodes
-%{_sbindir}/edit-livecd
-%{_sbindir}/livecd-iso-to-iscsi
-%{_sbindir}/livecd-setauth
-%{_sbindir}/livecd-rpms
+#%{_sbindir}/create-ovirt-iso-nodes
+#%{_sbindir}/edit-livecd
+#%{_sbindir}/livecd-iso-to-iscsi
+#%{_sbindir}/livecd-setauth
+#%{_sbindir}/livecd-rpms

 %files pxe
 %defattr(0644,root,root,0755)
-- 
1.6.2.5