Download as
Browse Code »

Commit 84f114824bcb1b8a5d0a5702f2e4e0f595b963dc

Authored by David Silva
Committed by Rodrigo Siqueira de Melo
1 parent e69b1809
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

Bumps colab spec version

Showing 2 changed files with 8 additions and 7 deletions   Show diff stats
colab-spb-theme-plugin/colab-spb-theme-plugin.spec
  Diff comments   View file @84f1148
... ... @@ -18,15 +18,16 @@ This package contains Colab theme for Software Público Brasileiro platform.
18 18 make
19 19  
20 20 %install
21   -cat >> %{buildroot}/etc/colab/settings.d/spb_theme.py << EOF
22   -COLAB_STATICS=['%{buildroot}/usr/lib/colab/colab-spb-theme-plugin/src/colab_spb_theme/static']
23   -COLAB_TEMPLATES=('%{buildroot}/usr/lib/colab/colab-spb-theme-plugin/src/colab_spb_theme/templates',)
24   -EOF
25 21  
26   -chmod 0750 root:colab %{buildroot}/etc/colab/settings.d/spb_theme.py
27   -chown root:colab %{buildroot}/etc/colab/settings.d/spb_theme.py
  22 +install -d %{buildroot}/etc/colab/settings.d/
  23 +
  24 +cat > %{buildroot}/etc/colab/settings.d/spb_theme.py << EOF
  25 +COLAB_STATICS=['/usr/lib/colab/colab-spb-theme-plugin/src/colab_spb_theme/static']
  26 +COLAB_TEMPLATES=('/usr/lib/colab/colab-spb-theme-plugin/src/colab_spb_theme/templates',)
  27 +EOF
28 28  
29 29 make install DESTDIR=%{buildroot}
30 30  
31 31 %files
32 32 /usr/lib/colab
  33 +/etc/colab
... ...
colab/colab.spec
  Diff comments   View file @84f1148
... ... @@ -30,7 +30,7 @@ Integrated software development platform.
30 30 # install colab into virtualenv to make sure dependencies are OK
31 31 rm -rf %{buildvenv}
32 32 cp -r /usr/lib/colab %{buildvenv}
33   -PATH=%{buildvenv}/bin:$PATH pip install --no-index .
  33 +PATH=%{buildvenv}/bin:$PATH pip install --use-wheel --no-index .
34 34 virtualenv --relocatable %{buildvenv}
35 35  
36 36 # cleanup virtualenv
... ...