Download as
Browse Code »

Commit 6e002fe056993700a543c2433c750fdf99bb4c3d

Authored by Sergio Oliveira
2 parents 81088d59 d2854854
Exists in colab-master

Merge branch 'colab-master' of beta.softwarepublico.gov.br:softwarepublico/pkg-rpm into colab-master

Showing 7 changed files with 118 additions and 15 deletions   Show diff stats
@@ -10,6 +10,7 @@ obsdir = .obs @@ -10,6 +10,7 @@ obsdir = .obs
10 all: 10 all:
11 @echo "Usage:" 11 @echo "Usage:"
12 @echo 12 @echo
  13 + @echo '$$ make $${pkg}-checkout checkout $${pkg}'
13 @echo '$$ make $${pkg}-upload uploads package $${pkg}' 14 @echo '$$ make $${pkg}-upload uploads package $${pkg}'
14 @echo '$$ make $${pkg}-build builds package $${pkg} locally' 15 @echo '$$ make $${pkg}-build builds package $${pkg} locally'
15 @echo '$$ make $${pkg}-diff diff from OBS to git for package $${pkg}' 16 @echo '$$ make $${pkg}-diff diff from OBS to git for package $${pkg}'
colab-deps/colab-deps.spec
  Diff comments   View file @6e002fe
1 %define name colab-deps 1 %define name colab-deps
2 -%define version 1.10 2 +%define version 1.11
3 %define release 1 3 %define release 1
4 4
5 -Summary: Collaboration platform for communities (Pyton dependencies) 5 +Summary: Collaboration platform for communities (Python dependencies)
6 Name: %{name} 6 Name: %{name}
7 Version: %{version} 7 Version: %{version}
8 Release: %{release} 8 Release: %{release}
@@ -14,17 +14,20 @@ Prefix: %{_prefix} @@ -14,17 +14,20 @@ 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, gcc 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 +Requires: python-virtualenv
17 18
18 %description 19 %description
19 Integrated software development platform (Python dependencies). 20 Integrated software development platform (Python dependencies).
20 21
21 %prep 22 %prep
22 -%setup -n %{name}-%{version} -n %{name}-%{version} 23 +%setup -q
23 24
24 %build 25 %build
  26 +cd %{_builddir}
25 make 27 make
26 28
27 %install 29 %install
  30 +cd %{_builddir}
28 %make_install 31 %make_install
29 32
30 %clean 33 %clean
colab/colab.spec
  Diff comments   View file @6e002fe
1 %define name colab 1 %define name colab
2 -%define version 1.10.2  
3 -%define unmangled_version 1.10.2 2 +%define version 1.11.0
4 %define default_release 1 3 %define default_release 1
5 %{!?release: %define release %{default_release}} 4 %{!?release: %define release %{default_release}}
6 %define buildvenv /var/tmp/%{name}-%{version} 5 %define buildvenv /var/tmp/%{name}-%{version}
@@ -9,7 +8,7 @@ Summary: Collaboration platform for communities @@ -9,7 +8,7 @@ Summary: Collaboration platform for communities
9 Name: %{name} 8 Name: %{name}
10 Version: %{version} 9 Version: %{version}
11 Release: %{release} 10 Release: %{release}
12 -Source0: %{name}-%{unmangled_version}.tar.gz 11 +Source0: %{name}-%{version}.tar.gz
13 License: GPLv2 12 License: GPLv2
14 Group: Development/Tools 13 Group: Development/Tools
15 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot 14 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -17,14 +16,15 @@ Prefix: %{_prefix} @@ -17,14 +16,15 @@ Prefix: %{_prefix}
17 Vendor: Sergio Oliveira <sergio@tracy.com.br> 16 Vendor: Sergio Oliveira <sergio@tracy.com.br>
18 Url: https://github.com/colab/colab 17 Url: https://github.com/colab/colab
19 BuildArch: noarch 18 BuildArch: noarch
20 -BuildRequires: colab-deps >= 1.10, python-virtualenv  
21 -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
22 22
23 %description 23 %description
24 Integrated software development platform. 24 Integrated software development platform.
25 25
26 %prep 26 %prep
27 -%setup -n %{name}-%{unmangled_version} -n %{name}-%{unmangled_version} 27 +%setup -n %{name}-%{version} -n %{name}-%{version}
28 28
29 %build 29 %build
30 # install colab into virtualenv to make sure dependencies are OK 30 # install colab into virtualenv to make sure dependencies are OK
@@ -86,6 +86,7 @@ rm -rf %{buildvenv} @@ -86,6 +86,7 @@ rm -rf %{buildvenv}
86 /var/log/colab 86 /var/log/colab
87 %{_bindir}/* 87 %{_bindir}/*
88 /etc/cron.d/colab 88 /etc/cron.d/colab
  89 +/etc/colab
89 /etc/colab/gunicorn.py 90 /etc/colab/gunicorn.py
90 /lib/systemd/system/colab.service 91 /lib/systemd/system/colab.service
91 92
@@ -145,8 +146,8 @@ LOGGING = { @@ -145,8 +146,8 @@ LOGGING = {
145 'disable_existing_loggers': True, 146 'disable_existing_loggers': True,
146 147
147 'formatters': { 148 'formatters': {
148 - 'colab': '[colab] (%(name)s) %(levelname)s: %(message)s',  
149 - 'verbose': '%(asctime)s (%(name)s) %(levelname)s: %(message)s', 149 + 'colab': { 'format' : '[colab] (%%(name)s) %%(levelname)s: %%(message)s'},
  150 + 'verbose': { 'format' : '%%(asctime)s (%%(name)s) %%(levelname)s: %%(message)s'},
150 }, 151 },
151 152
152 'handlers': { 153 'handlers': {
@@ -201,6 +202,14 @@ fi @@ -201,6 +202,14 @@ fi
201 202
202 yes yes | colab-admin collectstatic 203 yes yes | colab-admin collectstatic
203 204
  205 +if [ $1 -gt 1 ]; then
  206 + # upgrade; restart if running
  207 + systemctl try-restart colab
  208 +fi
  209 +
204 %preun 210 %preun
205 -systemctl stop colab  
206 -systemctl disable colab 211 +if [ $1 -eq 0 ]; then
  212 + # package being removed
  213 + systemctl stop colab
  214 + systemctl disable colab
  215 +fi
kalibro-configurations-deps/kalibro-configurations-deps.spec 0 → 100644
  Diff comments   View file @6e002fe
@@ -0,0 +1,29 @@ @@ -0,0 +1,29 @@
  1 +Name: kalibro-configurations-deps
  2 +Version: 1.0
  3 +Release: 2%{?dist}
  4 +Summary: Ruby dependencies for kalibro-configurations
  5 +Group: Development/Tools
  6 +License: Various
  7 +URL: http://mezuro.org
  8 +Source0: %{name}-%{version}.tar.gz
  9 +
  10 +BuildRequires: make, gcc, gcc-c++, ruby, ruby-devel, rubygem-bundler, postgresql-devel, libxml2-devel, libxslt-devel, sqlite-devel
  11 +Requires: ruby, rubygem-bundler
  12 +
  13 +%description
  14 +Ruby dependencies for kalibro-configurations.
  15 +
  16 +%prep
  17 +%autosetup
  18 +
  19 +%build
  20 +make %{?_smp_mflags}
  21 +
  22 +%install
  23 +%make_install
  24 +
  25 +%files
  26 +/usr/lib/kalibro-configurations
  27 +%doc
  28 +
  29 +%changelog
kalibro-processor-deps/kalibro-processor-deps.spec 0 → 100644
  Diff comments   View file @6e002fe
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
  1 +Name: kalibro-processor-deps
  2 +Version: 1.0+really0.10.0
  3 +Release: 1%{?dist}
  4 +Summary: Ruby dependencies for kalibro-processor
  5 +Group: Development/Tools
  6 +License: Various
  7 +URL: http://mezuro.org
  8 +Source0: %{name}-%{version}.tar.gz
  9 +BuildRequires: make, gcc, gcc-c++, ruby, ruby-devel
  10 +BuildRequires: rubygem-bundler, postgresql-devel
  11 +BuildRequires: libxml2-devel, libxslt-devel, sqlite-devel
  12 +Requires: ruby, rubygem-bundler
  13 +
  14 +%description
  15 +Ruby dependencies for kalibro-processor.
  16 +
  17 +%prep
  18 +%autosetup
  19 +
  20 +%build
  21 +make %{?_smp_mflags}
  22 +
  23 +%install
  24 +%make_install
  25 +
  26 +%files
  27 +/usr/lib/kalibro-processor
  28 +%doc
  29 +
  30 +%changelog
mailman-api/mailman-api.spec
  Diff comments   View file @6e002fe
1 %define name mailman-api 1 %define name mailman-api
2 -%define version 0.2.10  
3 -%define unmangled_version 0.2.10 2 +%define version 0.3c1
  3 +%define unmangled_version 0.3c1
4 %define release 1 4 %define release 1
5 5
6 Summary: REST API daemon to interact with Mailman 2 6 Summary: REST API daemon to interact with Mailman 2
prezento-spb-deps/prezento-spb-deps.spec 0 → 100644
  Diff comments   View file @6e002fe
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
  1 +Name: prezento-spb-deps
  2 +Version: 0.8.3.colab
  3 +Release: 1%{?dist}
  4 +Summary: Ruby dependencies for prezento
  5 +Group: Development/Tools
  6 +License: Various
  7 +URL: http://mezuro.org
  8 +Source0: %{name}-%{version}.tar.gz
  9 +
  10 +BuildRequires: make, gcc, gcc-c++, ruby, ruby-devel
  11 +BuildRequires: rubygem-bundler, postgresql-devel
  12 +BuildRequires: libxml2-devel, libxslt-devel, sqlite-devel
  13 +Requires: ruby, rubygem-bundler
  14 +
  15 +%description
  16 +Ruby dependencies for prezento
  17 +
  18 +%prep
  19 +%autosetup
  20 +
  21 +%build
  22 +make %{?_smp_mflags}
  23 +
  24 +%install
  25 +%make_install
  26 +
  27 +%files
  28 +/usr/lib/prezento-spb
  29 +%doc
  30 +
  31 +%changelog