Merge pull request #43 from basho/jem-riak-support

Add SRPMS and make RPM version field fully compatible
basho · Apr 18, 2013 · 54bbda3 · 54bbda3
2 parents d9530b3 + 7519791
commit 54bbda3
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/priv/templates/rpm/Makefile b/priv/templates/rpm/Makefile
@@ -3,20 +3,23 @@ PWD    = $(shell pwd)
 DISTRO = $(shell head -1 /etc/redhat-release| awk \
            '{if ($$0 ~ /CentOS release 5/) { print ".el5."} else { print "." }} ')
 
+# No hyphens are allowed in the _version field in RPM
+PKG_VERSION_NO_H	?= $(shell echo $(PKG_VERSION) | tr - .)
+
 default:
 	mkdir -p BUILD
 	mkdir -p packages
 	rpmbuild --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}$(DISTRO)%%{ARCH}.rpm" \
-		 --define '_topdir $(PWD)' \
-		 --define '_sourcedir $(PWD)' \
-		 --define '_specdir $(PWD)' \
-		 --define '_rpmdir $(PWD)/packages' \
-		 --define '_srcrpmdir $(PWD)' \
-		 --define "_revision $(PKG_VERSION)" \
-		 --define "_version $(PKG_VERSION)" \
-		 --define "_release $(PKG_BUILD)" \
-		 --define "_tarname $(PKG_ID).tar.gz" \
-		 -ba $(PWD)/specfile
+		--define '_topdir $(PWD)' \
+		--define '_sourcedir $(PWD)' \
+		--define '_specdir $(PWD)' \
+		--define '_rpmdir $(PWD)/packages' \
+		--define '_srcrpmdir $(PWD)/packages' \
+		--define "_revision $(PKG_VERSION)" \
+		--define "_version $(PKG_VERSION_NO_H)" \
+		--define "_release $(PKG_BUILD)" \
+		--define "_tarname $(PKG_ID).tar.gz" \
+		-ba $(PWD)/specfile
 	cd packages && \
 		for rpmfile in `ls *.rpm`; do \
 			sha256sum $${rpmfile} > $${rpmfile}.sha \