Download as
Browse Code »

Commit 20209bc35e7dc7124df87000b6ce92791e97a024

Authored by Antonio Terceiro
1 parent 00eafd9b
Exists in master and in 7 other branches colab-master, gitlab-pkg, kalibro-configurations, makefile, update_colab_deps, update_noosfero_deps, updatev3

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