X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=opencloud.spec;h=3ec5a1733106b1f6c57b69f008f2f56eadbf1f8a;hb=5504940c1f508a2dd35bfd440a7b360834331731;hp=65fca1ff4b8f651740e1628a578609b3a71bf2bd;hpb=91d769f774b0fec212b6dde26b73b6ac1d5aea0d;p=plstackapi.git diff --git a/opencloud.spec b/opencloud.spec index 65fca1f..3ec5a17 100644 --- a/opencloud.spec +++ b/opencloud.spec @@ -1,7 +1,7 @@ Summary: OpenCloud core services Name: opencloud -Version: 1.0.10 -Release: 2 +Version: 1.0.20 +Release: 1 License: GPL+ Group: Development/Tools Source0: %{_tmppath}/%{name}-%{version}.tar.gz @@ -29,7 +29,7 @@ requires: GeoIP # Empty section. %pre -pip-python install django==1.5 +#pip-python install django==1.5 pip-python install djangorestframework pip-python install markdown # Markdown support for the browseable API. pip-python install pyyaml # YAML content-type support. @@ -60,8 +60,10 @@ if [ ! -f /usr/share/GeoIP/GeoLiteCity.dat ]; then fi if [ "$1" == 2 ] ; then - echo "UPGRADE - saving current state" - /opt/planetstack/scripts/opencloud dumpdata + if [[ -e /opt/planetstack/scripts/opencloud ]]; then + echo "UPGRADE - saving current state" + /opt/planetstack/scripts/opencloud dumpdata + fi fi %install @@ -71,14 +73,18 @@ install -d %{buildroot}/opt/planetstack # in builddir cp -rp ./planetstack %{buildroot}/opt/. +cp observer-initscript %{buildroot}/etc/init.d/plstackobserver -find %{buildroot}/opt/planetstack -type f -print | sed "s@^$RPM_BUILD_ROOT@@g" > %{_tmppath}/tmp-filelist +find %{buildroot}/opt/planetstack -type f -print | sed "s@^$RPM_BUILD_ROOT@@g" > %{_tmppath}/tmp-filelist +cp %{_tmppath}/tmp-filelist /tmp/tmp-filelist %clean rm -rf %{buildroot} %files -f %{_tmppath}/tmp-filelist %defattr(-,root,root,-) +%config /opt/planetstack/plstackapi_config +%config /opt/planetstack/deployment_auth.py %post if [ "$1" == 1 ] ; then