From b5d8a5ccb2dd6e3e32ffaa0dc78f67ecf84afe93 Mon Sep 17 00:00:00 2001
From: David Carlos <ddavidcarlos1392@gmail.com>
Date: Thu, 21 Jan 2016 13:13:15 -0200
Subject: [PATCH] Gets package version from file

---
 src/Makefile | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 6c84dfd..0fee4b7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,12 +4,10 @@ subdirs = colab-spb-plugin colab-spb-theme-plugin noosfero-spb
 noosfero_repo = 'git@softwarepublico.gov.br:softwarepublico/noosfero.git'
 colab_repo = 'https://github.com/colab/colab.git'
 
-noosfero_remote_version  = $(shell git ls-remote --tags $(noosfero_repo) | \
-			    tail -n 1 | sed 's/^.*\///' | sed 's/\^{}//')
+noosfero_version  = $(shell sed -n '1,1p' ../CORE_VERSION)
 #For some reason, the tag to use in the url request, is diferent from the
 #tag showed in gitlab interface.
-noosfero_gitlab_version  = $(shell git ls-remote --tags ${noosfero_repo} | \
-			    tail -n 1 | sed 's/^.*\///' | sed 's/\^{}//' | sed 's/+/%2B/')
+colab_version = $(shell sed -n '2,2p' ../CORE_VERSION)
 
 dist_all = $(patsubst %, %-dist, $(subdirs))
 dist: $(dist_all)
@@ -61,25 +59,25 @@ release_plugins:
 
 packages=noosfero colab
 core_packages = $(patsubst %, %-build, $(packages))
-noosfero_untar_project_name='noosfero.git'
-colab_untar_project_name='colab-master'
 
 $(core_packages) : %-build :
 	@if [ "$*" == 'noosfero' ]; then \
 	    wget https://softwarepublico.gov.br/gitlab/softwarepublico/noosfero/repository/archive.tar.gz?ref=stable-spb-1.3 \
-	    --no-check-certificate -O pkg-rpm/$*/$*-12345.tar.gz ; \
+	    --no-check-certificate -O pkg-rpm/$*/$*-$(noosfero_version).tar.gz ; \
 	else \
-	    wget https://github.com/colab/colab/archive/master.tar.gz -O pkg-rpm/$*/$*-12345.tar.gz; \
+	    wget https://github.com/colab/colab/archive/master.tar.gz -O pkg-rpm/$*/$*-$(colab_version).tar.gz; \
 	fi
-	tar -xf pkg-rpm/$*/$*-12345.tar.gz -C pkg-rpm/$*/
-	rm pkg-rpm/$*/$*-12345.tar.gz
+	tar -xf pkg-rpm/$*/*.tar.gz -C pkg-rpm/$*/
+	rm pkg-rpm/$*/*.tar.gz
 	@if [ "$*" == 'noosfero' ]; then \
-	    mv pkg-rpm/$*/$*{.git,-12345}; \
-	    (cd pkg-rpm/$*/ && tar -zcf $*-12345.tar.gz $*-12345 && rm -rf $*-12345); \
+	    mv pkg-rpm/$*/$*{.git,-$(noosfero_version)}; \
+	    (cd pkg-rpm/$*/ && tar -zcf $*-$(noosfero_version).tar.gz $*-$(noosfero_version) && rm -rf $*-$(noosfero_version)); \
+	    sed -i -e 's/^\(Version:\s*\).*/\1$(noosfero_version)/' \
+		    pkg-rpm/$*/$*.spec; \
 	else \
-	    mv pkg-rpm/$*/$*-{master,12345}; \
-	    (cd pkg-rpm/$*/ && tar -zcf $*-12345.tar.gz $*-12345 && rm -rf $*-master-12345) \
+	    mv pkg-rpm/$*/$*-{master,$(colab_version)}; \
+	    (cd pkg-rpm/$*/ && tar -zcf $*-$(colab_version).tar.gz $*-$(colab_version) && rm -rf $*-$(colab_version)); \
+	    sed -i -e 's/^\(Version:\s*\).*/\1$(colab_version)/' \
+		    pkg-rpm/$*/$*.spec; \
 	fi
-	sed -i -e 's/^\(Version:\s*\).*/\112345/' \
-	        pkg-rpm/$*/$*.spec
 	$(MAKE) -C pkg-rpm/ $*-build
--
libgit2 0.21.2