[Ovirt-devel] [PATCH ovirt-node-image] use rawhide repos for Fedora 10

[Alan Pevec]

for experimental builds, until it gets released

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

diff --git a/ovirt-node-image.ks b/ovirt-node-image.ks
index f5695d8..32bd055 100644
--- a/ovirt-node-image.ks
+++ b/ovirt-node-image.ks
@@ -8,6 +8,8 @@
 %end
 
 %post
+# cleanup rpmdb to allow non-matching host and chroot RPM versions
+rm -f /var/lib/rpm/__db*
 %include common-post.ks
 
 touch /.autorelabel
diff --git a/ovirt-node-image.spec.in b/ovirt-node-image.spec.in
index dbe8834..5a874f7 100644
--- a/ovirt-node-image.spec.in
+++ b/ovirt-node-image.spec.in
@@ -36,22 +36,38 @@ The PXE boot image for oVirt Node network boot from oVirt Server.
 %setup -q
 
 %build
-if [ -n "%{?fedora_url}" ]; then
-   cat > repos.ks << EOF
-repo --name=f%{fedora} --baseurl=%{fedora_url}/releases/%{fedora}/Everything/%{_arch}/os
-repo --name=f%{fedora}-updates --baseurl=%{fedora_url}/updates/%{fedora}/%{_arch}
-repo --name=f%{fedora}-updates-newkey --baseurl=%{fedora_url}/updates/%{fedora}/%{_arch}.newkey
+%if 0%{?fedora} == 010
+ # XXX current rawhide
+ %if "%{?fedora_url}" == ""
+cat > repos.ks << EOF
+repo --name=rawhide --mirrorlist=%{fedora_mirror}?repo=rawhide&arch=%{_arch}
+EOF
+ %else
+cat > repos.ks << EOF
+repo --name=rawhide --baseurl=%{fedora_url}/development/%{_arch}/os
 EOF
-else
-  cat > repos.ks << EOF
+ %endif
+cat >> repos.ks << EOF
+repo --name=ovirt-org --baseurl=%{ovirt_url}/development/%{_arch}
+EOF
+%else
+ %if "%{?fedora_url}" == ""
+cat > repos.ks << EOF
 repo --name=f%{fedora} --mirrorlist=%{fedora_mirror}?repo=fedora-%{fedora}&arch=%{_arch}
-repo --name=f%{fedora}-updates --mirrorlist=%{fedora_mirror}?repo=updates-released-f%{fedora}&arch=%{_arch}
 repo --name=f%{fedora}-updates-newkey --mirrorlist=%{fedora_mirror}?repo=updates-released-f%{fedora}.newkey&arch=%{_arch}
 EOF
-fi
-
+ %else
+cat > repos.ks << EOF
+repo --name=f%{fedora} --baseurl=%{fedora_url}/releases/%{fedora}/Everything/%{_arch}/os
+repo --name=f%{fedora}-updates-newkey --baseurl=%{fedora_url}/updates/%{fedora}/%{_arch}.newkey
+EOF
+ %endif
 cat >> repos.ks << EOF
 repo --name=ovirt-org --baseurl=%{ovirt_url}/%{fedora}/%{_arch}
+EOF
+%endif
+
+cat >> repos.ks << EOF
 repo --name=ovirt-local --baseurl=%{ovirt_local_repo}
 EOF
 
-- 
1.5.5.1