diff --git a/colab-spb-theme-plugin/colab-spb-theme-plugin.spec b/colab-spb-theme-plugin/colab-spb-theme-plugin.spec index a0e63a5..3b4e705 100644 --- a/colab-spb-theme-plugin/colab-spb-theme-plugin.spec +++ b/colab-spb-theme-plugin/colab-spb-theme-plugin.spec @@ -18,15 +18,16 @@ This package contains Colab theme for Software Público Brasileiro platform. make %install -cat >> %{buildroot}/etc/colab/settings.d/spb_theme.py << EOF -COLAB_STATICS=['%{buildroot}/usr/lib/colab/colab-spb-theme-plugin/src/colab_spb_theme/static'] -COLAB_TEMPLATES=('%{buildroot}/usr/lib/colab/colab-spb-theme-plugin/src/colab_spb_theme/templates',) -EOF -chmod 0750 root:colab %{buildroot}/etc/colab/settings.d/spb_theme.py -chown root:colab %{buildroot}/etc/colab/settings.d/spb_theme.py +install -d %{buildroot}/etc/colab/settings.d/ + +cat > %{buildroot}/etc/colab/settings.d/spb_theme.py << EOF +COLAB_STATICS=['/usr/lib/colab/colab-spb-theme-plugin/src/colab_spb_theme/static'] +COLAB_TEMPLATES=('/usr/lib/colab/colab-spb-theme-plugin/src/colab_spb_theme/templates',) +EOF make install DESTDIR=%{buildroot} %files /usr/lib/colab +/etc/colab diff --git a/colab/colab.spec b/colab/colab.spec index 099110e..322cf98 100644 --- a/colab/colab.spec +++ b/colab/colab.spec @@ -30,7 +30,7 @@ Integrated software development platform. # install colab into virtualenv to make sure dependencies are OK rm -rf %{buildvenv} cp -r /usr/lib/colab %{buildvenv} -PATH=%{buildvenv}/bin:$PATH pip install --no-index . +PATH=%{buildvenv}/bin:$PATH pip install --use-wheel --no-index . virtualenv --relocatable %{buildvenv} # cleanup virtualenv -- libgit2 0.21.2