From 11a2734958f47300dae7a309141c30a262606567 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Thu, 25 Jun 2015 15:07:04 -0300 Subject: [PATCH] update colab and colab-deps from what's in OBS --- colab-deps/colab-deps.spec | 4 ++-- colab/colab.spec | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/colab-deps/colab-deps.spec b/colab-deps/colab-deps.spec index 6b8e2ab..57ed3f8 100644 --- a/colab-deps/colab-deps.spec +++ b/colab-deps/colab-deps.spec @@ -1,5 +1,5 @@ %define name colab-deps -%define version 1.3 +%define version 1.4 %define release 1 Summary: Collaboration platform for communities (Pyton dependencies) @@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Prefix: %{_prefix} Vendor: Sergio Oliveira Url: https://gitlab.com/softwarepublico/colab-deps -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 +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 %description Integrated software development platform (Python dependencies). diff --git a/colab/colab.spec b/colab/colab.spec index c3f03c0..404f4b6 100644 --- a/colab/colab.spec +++ b/colab/colab.spec @@ -1,7 +1,8 @@ %define name colab -%define version 2.0a2 -%define unmangled_version 2.0a2 -%define release 7 +%define version 1.10 +%define unmangled_version 1.10 +%define default_release 1 +%{!?release: %define release %{default_release}} %define buildvenv /var/tmp/%{name}-%{version} Summary: Collaboration platform for communities @@ -174,6 +175,9 @@ if [ -x /usr/bin/postgres ]; then colab-admin migrate fi +mkdir -p /var/lock/colab +chown colab:colab /var/lock/colab + mkdir -p /var/lib/colab-assets chown colab:colab /var/lib/colab-assets @@ -183,3 +187,6 @@ ln -s /var/lib/colab-assets /usr/share/nginx/colab yes yes | colab-admin collectstatic +%preun +systemctl stop colab +systemctl disable colab -- libgit2 0.21.2