Merge Request #2

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
specs/noosfero/noosfero.spec
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 4 Name: noosfero
4 5 Version: 1.1~rc2.5
5   -Release: 2%{?dist}
  6 +Release: 6%{?dist}
6 7 Summary: Social Networking Platform
7 8 Group: Applications/Publishing
8 9 License: AGPLv3
9 10 URL: http://noosfero.org
10 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 13 Patch1: 0001-Enhance-existing-backup-task-and-add-a-restore-one.patch
13 14 Patch2: 0001-Fix-backup-task.patch
14 15 BuildArch: noarch
15 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 19 %description
19 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 66 for dir in %{writable_dirs}; do
66 67 ln -sfT /var/lib/noosfero/public/$dir %{buildroot}/usr/lib/noosfero/public/$dir
67 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
    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 73 ln -sfT /var/tmp/noosfero %{buildroot}/usr/lib/noosfero/tmp
69 74 ln -sfT /var/log/noosfero %{buildroot}/usr/lib/noosfero/log
70 75  
... ... @@ -115,6 +120,8 @@ fi
115 120 for dir in %{writable_dirs}; do
116 121 mkdir -p /var/lib/noosfero/public/$dir
117 122 done
  123 +mkdir -p /var/lib/noosfero/cache
1
  124 +
118 125 chown -R noosfero:noosfero /var/lib/noosfero
119 126  
120 127 /etc/init.d/noosfero setup
... ...