Download as
Browse Code »

Commit 9a779d7bd5896f96536715243e08cade6d574700

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

noosfero: install plugins correctly

Showing 1 changed file with 8 additions and 2 deletions   Show diff stats
specs/noosfero/noosfero.spec
  Diff comments   View file @9a779d7
1 %define writable_dirs javascripts/cache stylesheets/cache articles image_uploads thumbnails 1 %define writable_dirs javascripts/cache stylesheets/cache articles image_uploads thumbnails
2 2
3 Name: noosfero 3 Name: noosfero
4 -Version: 1.1~rc2.1 4 +Version: 1.1~rc2.2
5 Release: 1%{?dist} 5 Release: 1%{?dist}
6 Summary: Social Networking Platform 6 Summary: Social Networking Platform
7 Group: Applications/Publishing 7 Group: Applications/Publishing
@@ -39,6 +39,8 @@ cp -r * %{buildroot}/usr/lib/noosfero/ @@ -39,6 +39,8 @@ cp -r * %{buildroot}/usr/lib/noosfero/
39 rm %{buildroot}/usr/lib/noosfero/{COPY*,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}
40 # no point in installing debian/ as part of the RPM 40 # no point in installing debian/ as part of the RPM
41 rm -rf %{buildroot}/usr/lib/noosfero/debian 41 rm -rf %{buildroot}/usr/lib/noosfero/debian
  42 +# installed plugins should be in /etc
  43 +rm -rf %{buildroot}/usr/lib/noosfero/config/plugins
42 44
43 # install config files 45 # install config files
44 mkdir -p %{buildroot}/etc/init.d 46 mkdir -p %{buildroot}/etc/init.d
@@ -47,7 +49,10 @@ cp etc/init.d/noosfero %{buildroot}/etc/init.d/ @@ -47,7 +49,10 @@ cp etc/init.d/noosfero %{buildroot}/etc/init.d/
47 mkdir -p %{buildroot}/etc/noosfero/plugins 49 mkdir -p %{buildroot}/etc/noosfero/plugins
48 ln -sf /etc/noosfero/database.yml %{buildroot}/usr/lib/noosfero/config/database.yml 50 ln -sf /etc/noosfero/database.yml %{buildroot}/usr/lib/noosfero/config/database.yml
49 ln -sf /etc/noosfero/thin.yml %{buildroot}/usr/lib/noosfero/config/thin.yml 51 ln -sf /etc/noosfero/thin.yml %{buildroot}/usr/lib/noosfero/config/thin.yml
50 -ln -sf /etc/noosfero/plugins %{buildroot}/usr/lib/noosfero/config/plugins 52 +
  53 +mkdir -p %{buildroot}/etc/noosfero/plugins
  54 +cp config/plugins/README %{buildroot}/etc/noosfero/plugins
  55 +ln -sfT /etc/noosfero/plugins %{buildroot}/usr/lib/noosfero/config/plugins
51 56
52 # symlink needed bits in public/ 57 # symlink needed bits in public/
53 for dir in %{writable_dirs}; do 58 for dir in %{writable_dirs}; do
@@ -131,6 +136,7 @@ chkconfig --del noosfero @@ -131,6 +136,7 @@ chkconfig --del noosfero
131 %files 136 %files
132 /usr/lib/noosfero 137 /usr/lib/noosfero
133 /etc/init.d/noosfero 138 /etc/init.d/noosfero
  139 +/etc/noosfero/plugins/README
134 %config(noreplace) /etc/default/noosfero 140 %config(noreplace) /etc/default/noosfero
135 %config(noreplace) /etc/noosfero/database.yml 141 %config(noreplace) /etc/noosfero/database.yml
136 %config(noreplace) /etc/noosfero/thin.yml 142 %config(noreplace) /etc/noosfero/thin.yml