Update colab.spec

- Bump Colab version - Update dependencies - Fix log directory permissions Signed-off-by: Alexandre Barbosa <alexandreab@live.com> Signed-off-by: Lucas Moura <lucas.moura128@gmail.com> Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com> Signed-off-by: Carlos Oliveira <carlospecter@gmail.com> Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>

Update colab.spec
- Bump Colab version - Update dependencies - Fix log directory permissions Signed-off-by: Alexandre Barbosa <alexandreab@live.com> Signed-off-by: Lucas Moura <lucas.moura128@gmail.com> Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com> Signed-off-by: Carlos Oliveira <carlospecter@gmail.com> Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Alexandre Barbosa · Rodrigo Siqueira de Melo
1 parent f40940f3
Showing 1 changed file with 9 additions and 6 deletions Show diff stats
colab/colab.spec
 %define name colab
-%define version 1.10.3
-%define default_release 4
+%define version 1.11.0
+%define default_release 1
 %{!?release: %define release %{default_release}}
 %define buildvenv /var/tmp/%{name}-%{version}
  
@@ -16,8 +16,9 @@ Prefix: %{_prefix}
 Vendor: Sergio Oliveira <sergio@tracy.com.br>
 Url: https://github.com/colab/colab
 BuildArch: noarch
-BuildRequires: colab-deps >= 1.10, python-virtualenv
-Requires: colab-deps >= 1.10, solr, mailman-api
+BuildRequires: colab-deps >= 1.11, python-virtualenv
+# TODO: Set mailman-api version (0.3c1)
+Requires: colab-deps >= 1.11, solr, mailman-api
  
 %description
 Integrated software development platform.
@@ -49,7 +50,7 @@ install -d -m 0755 %{buildroot}/etc/colab
 install -m 0644 misc/etc/colab/gunicorn.py %{buildroot}/etc/colab
  
 # install log
-install -d -m 0755 -o colab -g colab %{buildroot}/var/log/colab
+install -d -m 0755 %{buildroot}/var/log/colab
  
 # install virtualenv
 install -d -m 0755 %{buildroot}/usr/lib
@@ -85,7 +86,7 @@ rm -rf %{buildvenv}
 /var/log/colab
 %{_bindir}/*
 /etc/cron.d/colab
-/etc/colab/gunicorn.py
+/etc/colab
 /lib/systemd/system/colab.service
  
 %post
@@ -94,6 +95,8 @@ if ! id colab; then
   useradd --system --gid colab  --home-dir /usr/lib/colab --no-create-home colab
 fi
  
+chown -R colab:colab /var/log/colab
+
 if [ ! -f /etc/colab/settings.py ]; then
   SECRET_KEY=$(openssl rand -hex 32)
   cat > /etc/colab/settings.py <<EOF
1	1	%define name colab
2		-%define version 1.10.3
3		-%define default_release 4
	2	+%define version 1.11.0
	3	+%define default_release 1
4	4	%{!?release: %define release %{default_release}}
5	5	%define buildvenv /var/tmp/%{name}-%{version}
6	6
...	...	@@ -16,8 +16,9 @@ Prefix: %{_prefix}
16	16	Vendor: Sergio Oliveira <sergio@tracy.com.br>
17	17	Url: https://github.com/colab/colab
18	18	BuildArch: noarch
19		-BuildRequires: colab-deps >= 1.10, python-virtualenv
20		-Requires: colab-deps >= 1.10, solr, mailman-api
	19	+BuildRequires: colab-deps >= 1.11, python-virtualenv
	20	+# TODO: Set mailman-api version (0.3c1)
	21	+Requires: colab-deps >= 1.11, solr, mailman-api
21	22
22	23	%description
23	24	Integrated software development platform.
...	...	@@ -49,7 +50,7 @@ install -d -m 0755 %{buildroot}/etc/colab
49	50	install -m 0644 misc/etc/colab/gunicorn.py %{buildroot}/etc/colab
50	51
51	52	# install log
52		-install -d -m 0755 -o colab -g colab %{buildroot}/var/log/colab
	53	+install -d -m 0755 %{buildroot}/var/log/colab
53	54
54	55	# install virtualenv
55	56	install -d -m 0755 %{buildroot}/usr/lib
...	...	@@ -85,7 +86,7 @@ rm -rf %{buildvenv}
85	86	/var/log/colab
86	87	%{_bindir}/*
87	88	/etc/cron.d/colab
88		-/etc/colab/gunicorn.py
	89	+/etc/colab
89	90	/lib/systemd/system/colab.service
90	91
91	92	%post
...	...	@@ -94,6 +95,8 @@ if ! id colab; then
94	95	useradd --system --gid colab --home-dir /usr/lib/colab --no-create-home colab
95	96	fi
96	97
	98	+chown -R colab:colab /var/log/colab
	99	+
97	100	if [ ! -f /etc/colab/settings.py ]; then
98	101	SECRET_KEY=$(openssl rand -hex 32)
99	102	cat > /etc/colab/settings.py <<EOF
...	...