Updates for moving away from the iso based quick start

Mostly just spec file fixes.  The genome-repo-bootstrap script was updated to
rename the "respin" files since it would be confusing in the quickstart.

6 files changed, 14 insertions, 8 deletions

diff --git a/cloudmasterd/extra/cloudmasterd.spec b/cloudmasterd/extra/cloudmasterd.spec
index eb822d8..a2483fa 100644
--- a/cloudmasterd/extra/cloudmasterd.spec
+++ b/cloudmasterd/extra/cloudmasterd.spec
@@ -6,7 +6,7 @@
 Summary: Genome library and web application for managing cloud machines
 Name: rubygem-%{gemname}
 Version: 1.0.0
-Release: 14%{?dist}
+Release: 15%{?dist}
 Group: Applications/System
 License: GPLv2
 URL: https://fedorahosted.org/genome
diff --git a/genome-bridge/genome-bridge.spec b/genome-bridge/genome-bridge.spec
index 394f2a8..e167d3a 100644
--- a/genome-bridge/genome-bridge.spec
+++ b/genome-bridge/genome-bridge.spec
@@ -1,6 +1,6 @@
 Name:           genome-bridge
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Genome network bridge
 Group:          System Environment/Base
 License:        GPLv2
@@ -8,6 +8,7 @@ URL:            http://genome.et.redhat.com/
 Source0:        genome-bridge
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+Requires: 	bridge-utils
 
 %description
 Genome network bridging for kvm
diff --git a/genome-func/genome-func.spec b/genome-func/genome-func.spec
index dda0949..d46fd5f 100644
--- a/genome-func/genome-func.spec
+++ b/genome-func/genome-func.spec
@@ -4,14 +4,14 @@ Summary: Genome Func Applications
 Name: genome-func
 Source: genome-func-bin.tar.gz
 Version: 1.0.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Group: Applications/System
 URL: https://fedorahosting.org/genome
 License: GPLv2
 BuildRequires: python-devel
-Requires: func
+Requires: func >= 0.21-2
 
 %description
 Genome Func Applications to support the cloudmasterd functions
diff --git a/genome-release/genome-release.spec b/genome-release/genome-release.spec
index 7edf75e..617d1e9 100644
--- a/genome-release/genome-release.spec
+++ b/genome-release/genome-release.spec
@@ -1,6 +1,6 @@
 Name:           genome-release
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Genome repository configuration
 Group:          System Environment/Base
 License:        GPLv2
@@ -39,6 +39,9 @@ install -pm 644 genome.repo $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
 # We're not really making use of the devel and test Repos currently
 #install -pm 644 genome.repo genome-devel.repo genome-testing.repo $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
 
+%post 
+yum clean all
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -48,6 +51,8 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/yum.repos.d/*
 
 %changelog
+* Mon Jul 28 2008 Brenton Leanhardt <bleanhar@redhat.com>
+- Clear the yum cache in %post
 * Wed Jul 23 2008 Brenton Leanhardt <bleanhar@redhat.com>
 - Moved yum repositories to fedora people
 * Tue Jul 15 2008 Brenton Leanhardt <bleanhar@redhat.com>
diff --git a/genome-repo/genome-repo.spec b/genome-repo/genome-repo.spec
index 9ebc290..101de01 100644
--- a/genome-repo/genome-repo.spec
+++ b/genome-repo/genome-repo.spec
@@ -1,6 +1,6 @@
 Name:           genome-repo
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Genome repository 
 
 Group:          Applications/System
diff --git a/genome-repo/genome-repo/genome-repo-bootstrap b/genome-repo/genome-repo/genome-repo-bootstrap
index b4bc9a0..4d90445 100755
--- a/genome-repo/genome-repo/genome-repo-bootstrap
+++ b/genome-repo/genome-repo/genome-repo-bootstrap
@@ -19,7 +19,7 @@ case "$1" in
         /usr/bin/puppet --logdest=syslog /etc/genome/bootstrap.pp
 
         # If this is a respin machine, try to automatically configure it
-        if [ -e /etc/sysconfig/genome-respin ]; then
+        if [ -e /etc/sysconfig/genome-quickstart ]; then
             # Create a working directory for the sync
             mkdir /tmp/sync >> $LOG
             pushd /tmp/sync >> $LOG
@@ -48,7 +48,7 @@ case "$1" in
             popd >> $LOG
 
             # Remove the file so this only runs once
-            /bin/rm -f /etc/sysconfig/genome-respin
+            /bin/rm -f /etc/sysconfig/genome-quickstart
         fi
 
         RETVAL=$?