From 49d5a18f5d75e732ad0bae8e713d55663f28b040 Mon Sep 17 00:00:00 2001
From: David Carlos <ddavidcarlos1392@gmail.com>
Date: Wed, 28 Oct 2015 10:10:41 -0200
Subject: [PATCH] Adds new macros to noosfero

---
 src/pkg-rpm/noosfero/noosfero.spec | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/pkg-rpm/noosfero/noosfero.spec b/src/pkg-rpm/noosfero/noosfero.spec
index ad011e9..63f893c 100644
--- a/src/pkg-rpm/noosfero/noosfero.spec
+++ b/src/pkg-rpm/noosfero/noosfero.spec
@@ -1,6 +1,11 @@
 %define writable_dirs articles image_uploads thumbnails
 %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
+
 Name:    noosfero
 Version: 1.3.1+spb2
 Release: 6.1
@@ -10,8 +15,16 @@ License: AGPLv3
 URL:     http://noosfero.org
 Source0: %{name}-%{version}.tar.gz
 BuildArch: noarch
-BuildRequires: noosfero-deps >= 1.3-3, gettext, po4a
-Requires: noosfero-deps, po4a, tango-icon-theme, memcached,crontabs, nodejs
+BuildRequires: noosfero-deps >= 1.3-3
+BuildRequires: gettext
+BuildRequires: po4a
+Requires: ruby(release)
+Requires: noosfero-deps
+Requires: po4a
+Requires: tango-icon-theme
+Requires: memcached
+Requires: crontabs
+Requires: nodejs
 
 %description
 Noosfero is a web platform for social and solidarity economy networks with blog,
@@ -33,7 +46,7 @@ rm -f build.log Gemfile Gemfile.lock .bundle vendor/bundle
 rm -rf tmp log
 
 %install
-mkdir -p %{buildroot}/usr/lib/noosfero
+mkdir -p %{buildroot}%{noosfero_libdir}
 
 # install noosfero tree
 cp -r * %{buildroot}/usr/lib/noosfero/
@@ -44,16 +57,14 @@ rm -rf %{buildroot}/usr/lib/noosfero/debian
 rm -rf %{buildroot}/usr/lib/noosfero/config/plugins
 
 # install config files
-mkdir -p %{buildroot}/etc/init.d
-cp etc/init.d/noosfero %{buildroot}/etc/init.d/
-
-mkdir -p %{buildroot}/etc/noosfero/plugins
-ln -sf /etc/noosfero/database.yml %{buildroot}/usr/lib/noosfero/config/database.yml
-ln -sf /etc/noosfero/unicorn.rb %{buildroot}/usr/lib/noosfero/config/unicorn.rb
+mkdir -p %{buildroot}%{_initdir}
+cp etc/init.d/noosfero %{buildroot}%{_initdir}/
 
-mkdir -p %{buildroot}/etc/noosfero/plugins
-cp config/plugins/README %{buildroot}/etc/noosfero/plugins
-ln -sfT /etc/noosfero/plugins %{buildroot}/usr/lib/noosfero/config/plugins
+mkdir -p %{buildroot}%{noosfero_etcdir}/plugins
+ln -sf %{noosfero_etcdir}/database.yml %{buildroot}%{noosfero_libdir}/config/database.yml
+ln -sf %{noosfero_etcdir}/unicorn.rb %{buildroot}%{noosfero_libdir}/config/unicorn.rb
+cp config/plugins/README %{buildroot}%{noosfero_etcdir}/plugins
+ln -sfT %{noosfero_etcdir}/plugins %{buildroot}%{noosfero_libdir}/config/plugins
 
 # symlink needed bits in public/
 for dir in %{writable_dirs}; do
@@ -113,7 +124,7 @@ mkdir -p /var/lib/noosfero/cache
 
 chown -R noosfero:noosfero /var/lib/noosfero
 
-/etc/init.d/noosfero setup
+%{_initdir}/noosfero setup
 
 cd /usr/lib/noosfero/
 
@@ -143,9 +154,9 @@ service noosfero stop
 chkconfig --del noosfero
 
 %files
-/usr/lib/noosfero
-/etc/init.d/noosfero
-/etc/noosfero/plugins/README
+%{noosfero_libdir}
+%{_initdir}/noosfero
+%doc %{noosfero_etcdir}/plugins/README
 %config(noreplace) /etc/default/noosfero
 %config(noreplace) /etc/noosfero/database.yml
 %config(noreplace) /etc/noosfero/unicorn.rb
--
libgit2 0.21.2