Commit 6c3992b820b0a1835f5cfdaba5fba2af6698aeb1

Authored by Alexandre Barbosa
Committed by Rodrigo Siqueira de Melo
1 parent f40940f3
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

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>
Showing 1 changed file with 9 additions and 6 deletions   Show diff stats
colab/colab.spec
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
... ...