Download as
Browse Code »

Commit 11a2734958f47300dae7a309141c30a262606567

Authored by Antonio Terceiro
1 parent b4dfd41b
Exists in master and in 2 other branches colab-master, kalibro-configurations

update colab and colab-deps from what's in OBS

Showing 2 changed files with 12 additions and 5 deletions   Show diff stats
colab-deps/colab-deps.spec
  Diff comments   View file @11a2734
1 %define name colab-deps 1 %define name colab-deps
2 -%define version 1.3 2 +%define version 1.4
3 %define release 1 3 %define release 1
4 4
5 Summary: Collaboration platform for communities (Pyton dependencies) 5 Summary: Collaboration platform for communities (Pyton dependencies)
@@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot @@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
13 Prefix: %{_prefix} 13 Prefix: %{_prefix}
14 Vendor: Sergio Oliveira <sergio@tracy.com.br> 14 Vendor: Sergio Oliveira <sergio@tracy.com.br>
15 Url: https://gitlab.com/softwarepublico/colab-deps 15 Url: https://gitlab.com/softwarepublico/colab-deps
16 -BuildRequires: gettext, libxml2-devel, libxslt-devel, openssl-devel, libffi-devel, libjpeg-turbo-devel, zlib-devel, freetype-devel, postgresql-devel, python-devel, libyaml-devel, python-virtualenv, libev-devel 16 +BuildRequires: gettext, libxml2-devel, libxslt-devel, openssl-devel, libffi-devel, libjpeg-turbo-devel, zlib-devel, freetype-devel, postgresql-devel, python-devel, libyaml-devel, python-virtualenv, libev-devel, gcc
17 17
18 %description 18 %description
19 Integrated software development platform (Python dependencies). 19 Integrated software development platform (Python dependencies).
colab/colab.spec
  Diff comments   View file @11a2734
1 %define name colab 1 %define name colab
2 -%define version 2.0a2  
3 -%define unmangled_version 2.0a2  
4 -%define release 7 2 +%define version 1.10
  3 +%define unmangled_version 1.10
  4 +%define default_release 1
  5 +%{!?release: %define release %{default_release}}
5 %define buildvenv /var/tmp/%{name}-%{version} 6 %define buildvenv /var/tmp/%{name}-%{version}
6 7
7 Summary: Collaboration platform for communities 8 Summary: Collaboration platform for communities
@@ -174,6 +175,9 @@ if [ -x /usr/bin/postgres ]; then @@ -174,6 +175,9 @@ if [ -x /usr/bin/postgres ]; then
174 colab-admin migrate 175 colab-admin migrate
175 fi 176 fi
176 177
  178 +mkdir -p /var/lock/colab
  179 +chown colab:colab /var/lock/colab
  180 +
177 mkdir -p /var/lib/colab-assets 181 mkdir -p /var/lib/colab-assets
178 chown colab:colab /var/lib/colab-assets 182 chown colab:colab /var/lib/colab-assets
179 183
@@ -183,3 +187,6 @@ ln -s /var/lib/colab-assets /usr/share/nginx/colab @@ -183,3 +187,6 @@ ln -s /var/lib/colab-assets /usr/share/nginx/colab
183 187
184 yes yes | colab-admin collectstatic 188 yes yes | colab-admin collectstatic
185 189
  190 +%preun
  191 +systemctl stop colab
  192 +systemctl disable colab