From eb6bcf34792ee765707007d71e47a5f1c3097115 Mon Sep 17 00:00:00 2001
From: David Carlos <ddavidcarlos1392@gmail.com>
Date: Wed, 28 Oct 2015 15:36:42 -0200
Subject: [PATCH] Adds noosfero_libdir macro. Points to /usr/lib/noosfero

---
 src/pkg-rpm/noosfero/noosfero.spec | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/pkg-rpm/noosfero/noosfero.spec b/src/pkg-rpm/noosfero/noosfero.spec
index 63f893c..6d15011 100644
--- a/src/pkg-rpm/noosfero/noosfero.spec
+++ b/src/pkg-rpm/noosfero/noosfero.spec
@@ -2,6 +2,7 @@
 %define cache_dirs javascripts/cache stylesheets/cache
 
 %global noosfero_etcdir /etc/noosfero
+
 # Using this intead of %{_libdir}, because noosfero it's noarch
 %global noosfero_libdir /usr/lib/noosfero
 %global _initdir /etc/init.d
@@ -37,10 +38,10 @@ participate and contribute to this free software project!
 
 %build
 
-ln -sf /usr/lib/noosfero/Gemfile .
-ln -sf /usr/lib/noosfero/Gemfile.lock .
-ln -sf /usr/lib/noosfero/.bundle .
-ln -sfT /usr/lib/noosfero/vendor/bundle vendor/bundle
+ln -sf %{noosfero_libdir}/Gemfile .
+ln -sf %{noosfero_libdir}/Gemfile.lock .
+ln -sf %{noosfero_libdir}/.bundle .
+ln -sfT %{noosfero_libdir}/vendor/bundle vendor/bundle
 bundle exec rake -f Rakefile.release noosfero:translations:compile > build.log 2>&1 || (cat build.log; exit 1)
 rm -f build.log Gemfile Gemfile.lock .bundle vendor/bundle
 rm -rf tmp log
@@ -49,12 +50,12 @@ rm -rf tmp log
 mkdir -p %{buildroot}%{noosfero_libdir}
 
 # install noosfero tree
-cp -r * %{buildroot}/usr/lib/noosfero/
-rm %{buildroot}/usr/lib/noosfero/{COPY*,Vagrantfile,*.md,gitignore.example,public/dispatch.fcgi,public/dispatch.cgi,public/dispatch.rb}
+cp -r * %{buildroot}%{noosfero_libdir}/
+rm %{buildroot}%{noosfero_libdir}/{COPY*,Vagrantfile,*.md,gitignore.example,public/dispatch.fcgi,public/dispatch.cgi,public/dispatch.rb}
 # no point in installing debian/ as part of the RPM
-rm -rf %{buildroot}/usr/lib/noosfero/debian
+rm -rf %{buildroot}%{noosfero_libdir}/debian
 # installed plugins should be in /etc
-rm -rf %{buildroot}/usr/lib/noosfero/config/plugins
+rm -rf %{buildroot}%{noosfero_libdir}/config/plugins
 
 # install config files
 mkdir -p %{buildroot}%{_initdir}
@@ -68,18 +69,18 @@ ln -sfT %{noosfero_etcdir}/plugins %{buildroot}%{noosfero_libdir}/config/plugins
 
 # symlink needed bits in public/
 for dir in %{writable_dirs}; do
-  ln -sfT /var/lib/noosfero/public/$dir %{buildroot}/usr/lib/noosfero/public/$dir
+  ln -sfT /var/lib/noosfero/public/$dir %{buildroot}%{noosfero_libdir}/public/$dir
 done
 # symlink needed to cache
 for dir in %{cache_dirs}; do
-  ln -sfT /var/lib/noosfero/cache %{buildroot}/usr/lib/noosfero/public/$dir
+  ln -sfT /var/lib/noosfero/cache %{buildroot}%{noosfero_libdir}/public/$dir
 done
-ln -sfT /var/tmp/noosfero %{buildroot}/usr/lib/noosfero/tmp
-ln -sfT /var/log/noosfero %{buildroot}/usr/lib/noosfero/log
+ln -sfT /var/tmp/noosfero %{buildroot}%{noosfero_libdir}/tmp
+ln -sfT /var/log/noosfero %{buildroot}%{noosfero_libdir}/log
 
 # default themes
-ln -sfT noosfero   %{buildroot}/usr/lib/noosfero/public/designs/themes/default
-ln -sfT tango      %{buildroot}/usr/lib/noosfero/public/designs/icons/default
+ln -sfT noosfero   %{buildroot}%{noosfero_libdir}/public/designs/themes/default
+ln -sfT tango      %{buildroot}%{noosfero_libdir}/public/designs/icons/default
 
 
 cat > %{buildroot}/etc/noosfero/unicorn.rb <<EOF
@@ -100,7 +101,7 @@ EOF
 
 mkdir -p %{buildroot}/etc/default
 cat > %{buildroot}/etc/default/noosfero <<EOF
-NOOSFERO_DIR="/usr/lib/noosfero"
+NOOSFERO_DIR="%{noosfero_libdir}"
 NOOSFERO_USER="noosfero"
 NOOSFERO_DATA_DIR="/var/lib/noosfero"
 EOF
@@ -114,7 +115,7 @@ fi
 %post
 groupadd noosfero || true
 if ! id noosfero; then
-  adduser noosfero --system -g noosfero --shell /bin/sh --home-dir /usr/lib/noosfero
+  adduser noosfero --system -g noosfero --shell /bin/sh --home-dir %{noosfero_libdir}
 fi
 
 for dir in %{writable_dirs}; do
@@ -126,7 +127,7 @@ chown -R noosfero:noosfero /var/lib/noosfero
 
 %{_initdir}/noosfero setup
 
-cd /usr/lib/noosfero/
+cd %{noosfero_libdir}
 
 if [ -x /usr/bin/postgres ]; then
   if [ `systemctl is-active postgresql`!="active" ]; then
@@ -137,7 +138,8 @@ if [ -x /usr/bin/postgres ]; then
   su postgres -c "createuser noosfero -S -d -R"
   su noosfero -c "createdb noosfero_production"
 
-  cd /usr/lib/noosfero/
+  cd %{noosfero_libdir}
+
   su noosfero -c "RAILS_ENV=production bundle exec rake db:schema:load"
   su noosfero -c "RAILS_ENV=production SCHEMA=/dev/null bundle exec rake db:migrate"
   su noosfero -c "RAILS_ENV=production bundle exec rake db:data:minimal"
--
libgit2 0.21.2