Download as
Browse Code »

Commit 11a2734958f47300dae7a309141c30a262606567

Authored by Antonio Terceiro
1 parent b4dfd41b
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 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