Download as
Browse Code »

Commit 9ee75ff782388dff0bdde9acc2ee033e426859ef

Authored by Antonio Terceiro
2 parents 34df58c2 2f511b36
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

Merge branch 'noosfero_pkg' into 'master' 

Noosfero pkg

Added cron as a dependencie and change cache links to /var/lib/noosfero/cache/

See merge request !2
Showing 1 changed file with 11 additions and 4 deletions   Show diff stats
specs/noosfero/noosfero.spec
  Diff comments   View file @9ee75ff
1 -%define writable_dirs javascripts/cache stylesheets/cache articles image_uploads thumbnails 1 +%define writable_dirs articles image_uploads thumbnails
  2 +%define cache_dirs javascripts/cache stylesheets/cache
2 3
3 Name: noosfero 4 Name: noosfero
4 Version: 1.1~rc2.5 5 Version: 1.1~rc2.5
5 -Release: 2%{?dist} 6 +Release: 6%{?dist}
6 Summary: Social Networking Platform 7 Summary: Social Networking Platform
7 Group: Applications/Publishing 8 Group: Applications/Publishing
8 License: AGPLv3 9 License: AGPLv3
9 URL: http://noosfero.org 10 URL: http://noosfero.org
10 Source0: %{name}-%{version}.tar.gz 11 Source0: %{name}-%{version}.tar.gz
11 -Patch0: 0001-Use-as-placeholder-for-current-user-in-URLs.patch 12 +Patch0: 0001-Use-as-placeholder-for-current-user-in-URLs.patch
12 Patch1: 0001-Enhance-existing-backup-task-and-add-a-restore-one.patch 13 Patch1: 0001-Enhance-existing-backup-task-and-add-a-restore-one.patch
13 Patch2: 0001-Fix-backup-task.patch 14 Patch2: 0001-Fix-backup-task.patch
14 BuildArch: noarch 15 BuildArch: noarch
15 BuildRequires: noosfero-deps, gettext, po4a 16 BuildRequires: noosfero-deps, gettext, po4a
16 -Requires: noosfero-deps, po4a, tango-icon-theme, memcached 17 +Requires: noosfero-deps, po4a, tango-icon-theme, memcached,crontabs
17 18
18 %description 19 %description
19 Noosfero is a web platform for social and solidarity economy networks with blog, 20 Noosfero is a web platform for social and solidarity economy networks with blog,
@@ -65,6 +66,10 @@ ln -sfT /etc/noosfero/plugins %{buildroot}/usr/lib/noosfero/config/plugins @@ -65,6 +66,10 @@ ln -sfT /etc/noosfero/plugins %{buildroot}/usr/lib/noosfero/config/plugins
65 for dir in %{writable_dirs}; do 66 for dir in %{writable_dirs}; do
66 ln -sfT /var/lib/noosfero/public/$dir %{buildroot}/usr/lib/noosfero/public/$dir 67 ln -sfT /var/lib/noosfero/public/$dir %{buildroot}/usr/lib/noosfero/public/$dir
67 done 68 done
  69 +# symlink needed to cache
  70 +for dir in %{cache_dirs}; do
  71 + ln -sfT /var/lib/noosfero/cache %{buildroot}/usr/lib/noosfero/public/$dir
  72 +done
68 ln -sfT /var/tmp/noosfero %{buildroot}/usr/lib/noosfero/tmp 73 ln -sfT /var/tmp/noosfero %{buildroot}/usr/lib/noosfero/tmp
69 ln -sfT /var/log/noosfero %{buildroot}/usr/lib/noosfero/log 74 ln -sfT /var/log/noosfero %{buildroot}/usr/lib/noosfero/log
70 75
@@ -115,6 +120,8 @@ fi @@ -115,6 +120,8 @@ fi
115 for dir in %{writable_dirs}; do 120 for dir in %{writable_dirs}; do
116 mkdir -p /var/lib/noosfero/public/$dir 121 mkdir -p /var/lib/noosfero/public/$dir
117 done 122 done
  123 +mkdir -p /var/lib/noosfero/cache
  124 +
118 chown -R noosfero:noosfero /var/lib/noosfero 125 chown -R noosfero:noosfero /var/lib/noosfero
119 126
120 /etc/init.d/noosfero setup 127 /etc/init.d/noosfero setup