From 7cd47376fd700f8d4c31bb47b26715ea358750bf Mon Sep 17 00:00:00 2001
From: Frank <frank@cloud.com>
Date: Fri, 1 Apr 2011 15:47:16 -0700
Subject: [PATCH] Move all schema-*.sql to setup/db/db inline with db upgrade
 script

---
 cloud.spec                                     | 1 +
 setup/db/{ => db}/schema-20to21.sql            | 0
 setup/db/{ => db}/schema-217to218.sql          | 0
 setup/db/{ => db}/schema-21to22-cleanup.sql    | 0
 setup/db/{ => db}/schema-21to22.sql            | 0
 setup/db/{ => db}/schema-221to222-cleanup.sql  | 0
 setup/db/{ => db}/schema-221to222.sql          | 0
 setup/db/{ => db}/schema-222to224-cleanup.sql  | 0
 setup/db/{ => db}/schema-222to224.sql          | 0
 setup/db/{ => db}/schema-22beta1to22beta2.sql  | 0
 setup/db/{ => db}/schema-22beta3to22beta4.sql  | 0
 setup/db/{ => db}/schema-level.sql             | 0
 setup/db/{ => db}/schema-snapshot-217to223.sql | 0
 13 files changed, 1 insertion(+)
 rename setup/db/{ => db}/schema-20to21.sql (100%)
 rename setup/db/{ => db}/schema-217to218.sql (100%)
 rename setup/db/{ => db}/schema-21to22-cleanup.sql (100%)
 rename setup/db/{ => db}/schema-21to22.sql (100%)
 rename setup/db/{ => db}/schema-221to222-cleanup.sql (100%)
 rename setup/db/{ => db}/schema-221to222.sql (100%)
 rename setup/db/{ => db}/schema-222to224-cleanup.sql (100%)
 rename setup/db/{ => db}/schema-222to224.sql (100%)
 rename setup/db/{ => db}/schema-22beta1to22beta2.sql (100%)
 rename setup/db/{ => db}/schema-22beta3to22beta4.sql (100%)
 rename setup/db/{ => db}/schema-level.sql (100%)
 rename setup/db/{ => db}/schema-snapshot-217to223.sql (100%)

diff --git a/cloud.spec b/cloud.spec
index f3af1a28373..e91fcae696f 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -523,6 +523,7 @@ fi
 %attr(0755,root,root) %{_bindir}/%{name}-set-guest-sshkey
 %dir %{_datadir}/%{name}/setup
 %{_datadir}/%{name}/setup/*.sql
+%{_datadir}/%{name}/setup/db/*.sql
 %{_datadir}/%{name}/setup/*.sh
 %{_datadir}/%{name}/setup/server-setup.xml
 
diff --git a/setup/db/schema-20to21.sql b/setup/db/db/schema-20to21.sql
similarity index 100%
rename from setup/db/schema-20to21.sql
rename to setup/db/db/schema-20to21.sql
diff --git a/setup/db/schema-217to218.sql b/setup/db/db/schema-217to218.sql
similarity index 100%
rename from setup/db/schema-217to218.sql
rename to setup/db/db/schema-217to218.sql
diff --git a/setup/db/schema-21to22-cleanup.sql b/setup/db/db/schema-21to22-cleanup.sql
similarity index 100%
rename from setup/db/schema-21to22-cleanup.sql
rename to setup/db/db/schema-21to22-cleanup.sql
diff --git a/setup/db/schema-21to22.sql b/setup/db/db/schema-21to22.sql
similarity index 100%
rename from setup/db/schema-21to22.sql
rename to setup/db/db/schema-21to22.sql
diff --git a/setup/db/schema-221to222-cleanup.sql b/setup/db/db/schema-221to222-cleanup.sql
similarity index 100%
rename from setup/db/schema-221to222-cleanup.sql
rename to setup/db/db/schema-221to222-cleanup.sql
diff --git a/setup/db/schema-221to222.sql b/setup/db/db/schema-221to222.sql
similarity index 100%
rename from setup/db/schema-221to222.sql
rename to setup/db/db/schema-221to222.sql
diff --git a/setup/db/schema-222to224-cleanup.sql b/setup/db/db/schema-222to224-cleanup.sql
similarity index 100%
rename from setup/db/schema-222to224-cleanup.sql
rename to setup/db/db/schema-222to224-cleanup.sql
diff --git a/setup/db/schema-222to224.sql b/setup/db/db/schema-222to224.sql
similarity index 100%
rename from setup/db/schema-222to224.sql
rename to setup/db/db/schema-222to224.sql
diff --git a/setup/db/schema-22beta1to22beta2.sql b/setup/db/db/schema-22beta1to22beta2.sql
similarity index 100%
rename from setup/db/schema-22beta1to22beta2.sql
rename to setup/db/db/schema-22beta1to22beta2.sql
diff --git a/setup/db/schema-22beta3to22beta4.sql b/setup/db/db/schema-22beta3to22beta4.sql
similarity index 100%
rename from setup/db/schema-22beta3to22beta4.sql
rename to setup/db/db/schema-22beta3to22beta4.sql
diff --git a/setup/db/schema-level.sql b/setup/db/db/schema-level.sql
similarity index 100%
rename from setup/db/schema-level.sql
rename to setup/db/db/schema-level.sql
diff --git a/setup/db/schema-snapshot-217to223.sql b/setup/db/db/schema-snapshot-217to223.sql
similarity index 100%
rename from setup/db/schema-snapshot-217to223.sql
rename to setup/db/db/schema-snapshot-217to223.sql