Download as
Browse Code »

Commit 20209bc35e7dc7124df87000b6ce92791e97a024

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

noosfero: fix creation of symlinks to /var

Showing 1 changed file with 9 additions and 8 deletions   Show diff stats
specs/noosfero/noosfero.spec
  Diff comments   View file @20209bc
@@ -27,15 +27,16 @@ ln -sf /usr/lib/noosfero/Gemfile . @@ -27,15 +27,16 @@ ln -sf /usr/lib/noosfero/Gemfile .
27 ln -sf /usr/lib/noosfero/Gemfile.lock . 27 ln -sf /usr/lib/noosfero/Gemfile.lock .
28 ln -sf /usr/lib/noosfero/.bundle . 28 ln -sf /usr/lib/noosfero/.bundle .
29 ln -sfT /usr/lib/noosfero/vendor/bundle vendor/bundle 29 ln -sfT /usr/lib/noosfero/vendor/bundle vendor/bundle
30 -bundle exec rake -f Rakefile.release noosfero:translations:compile  
31 -rm -f Gemfile Gemfile.lock .bundle vendor/bundle 30 +bundle exec rake -f Rakefile.release noosfero:translations:compile > build.log 2>&1 || (cat build.log; exit 1)
  31 +rm -f build.log Gemfile Gemfile.lock .bundle vendor/bundle
  32 +rm -rf tmp log
32 33
33 %install 34 %install
34 mkdir -p %{buildroot}/usr/lib/noosfero 35 mkdir -p %{buildroot}/usr/lib/noosfero
35 36
36 # install noosfero tree 37 # install noosfero tree
37 cp -r . %{buildroot}/usr/lib/noosfero/ 38 cp -r . %{buildroot}/usr/lib/noosfero/
38 -rm %{buildroot}/usr/lib/noosfero/{Gemfile,Vagrantfile,*.md,gitignore.example,public/dispatch.fcgi,public/dispatch.cgi,public/dispatch.rb} 39 +rm %{buildroot}/usr/lib/noosfero/{COPY*,Vagrantfile,*.md,gitignore.example,public/dispatch.fcgi,public/dispatch.cgi,public/dispatch.rb}
39 40
40 # install config files 41 # install config files
41 mkdir -p %{buildroot}/etc/init.d 42 mkdir -p %{buildroot}/etc/init.d
@@ -48,14 +49,14 @@ ln -sf /etc/noosfero/plugins %{buildroot}/usr/lib/noosfero/config/plugins @@ -48,14 +49,14 @@ ln -sf /etc/noosfero/plugins %{buildroot}/usr/lib/noosfero/config/plugins
48 49
49 # symlink needed bits in public/ 50 # symlink needed bits in public/
50 for dir in %{writable_dirs}; do 51 for dir in %{writable_dirs}; do
51 - ln -s /var/lib/noosfero/public/$dir %{buildroot}/usr/lib/noosfero/public/$dir 52 + ln -sfT /var/lib/noosfero/public/$dir %{buildroot}/usr/lib/noosfero/public/$dir
52 done 53 done
53 -ln -s /var/tmp/noosfero %{buildroot}/usr/lib/noosfero/tmp  
54 -ln -s /var/log/noosfero %{buildroot}/usr/lib/noosfero/log 54 +ln -sfT /var/tmp/noosfero %{buildroot}/usr/lib/noosfero/tmp
  55 +ln -sfT /var/log/noosfero %{buildroot}/usr/lib/noosfero/log
55 56
56 # default themes 57 # default themes
57 -ln -s noosfero %{buildroot}/usr/lib/noosfero/public/designs/themes/default  
58 -ln -s tango %{buildroot}/usr/lib/noosfero/public/designs/icons/default 58 +ln -sfT noosfero %{buildroot}/usr/lib/noosfero/public/designs/themes/default
  59 +ln -sfT tango %{buildroot}/usr/lib/noosfero/public/designs/icons/default
59 60
60 61
61 cat > %{buildroot}/etc/noosfero/thin.yml <<EOF 62 cat > %{buildroot}/etc/noosfero/thin.yml <<EOF