Merge Request #2

← To merge requests From noosfero_pkg into master
Merged
softwarepublico/pkg-rpm!2
Created by Macartur Sousa

Noosfero pkg

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

Assignee: Antonio Terceiro
Milestone: None

Merged by Antonio Terceiro

Source branch has been removed
Commits (2)
2 participants
Showing 1 changed file   Show diff stats
specs/noosfero/noosfero.spec
  Diff comments   Edit   View file @2f511b3
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
1
  • 75e3b052e046e34cbb10917c5f9901d7?s=40&d=identicon
    Link here  
    Antonio Terceiro @terceiro

    I think you want ln -sfT /var/lib/noosfero/cache/$dir %{buildroot}/usr/lib/noosfero/public/$dir instead (note the extra /$dir in the first argument to ln.

    Choose File ...   File name...
    Cancel
  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
1
  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