X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=opencloud.spec;h=895b9dcd0172d725860d17e096a0e5c1f9047c1a;hb=7121285de503199c2d94c057b7c24fd62414b650;hp=4d72a55b8e3e77697364b5fc0c791e20a148d9a9;hpb=ca1b24a66589c42cd1d003da886d71686256bd48;p=plstackapi.git diff --git a/opencloud.spec b/opencloud.spec index 4d72a55..895b9dc 100644 --- a/opencloud.spec +++ b/opencloud.spec @@ -1,7 +1,7 @@ Summary: OpenCloud core services Name: opencloud -Version: 1.0.25 -Release: 8 +Version: 1.0.27 +Release: 3 License: GPL+ Group: Development/Tools Source0: %{_tmppath}/%{name}-%{version}.tar.gz @@ -18,6 +18,7 @@ requires: tar requires: gcc requires: python-httplib2 requires: GeoIP +requires: wget %description %{summary} @@ -29,7 +30,7 @@ requires: GeoIP # Empty section. %pre -#pip-python install django==1.5 +pip-python install django==1.7 pip-python install djangorestframework pip-python install markdown # Markdown support for the browseable API. pip-python install pyyaml # YAML content-type support. @@ -119,10 +120,9 @@ if [ "$1" == 1 ] ; then echo "NEW INSTALL - initializing database" /opt/planetstack/scripts/opencloud initdb else - echo "UPGRADE - doing evolution" + # scripts/opencloud will choose evolve or migrate depending on django version + echo "UPGRADE - doing evolution/migration" /opt/planetstack/scripts/opencloud evolvedb - #echo "UPGRADE - doing migration" - #/opt/planetstack/scripts/opencloud migratedb fi # start the server