couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woh...@apache.org
Subject [couchdb-pkg] branch master updated: Use $VERSION for version name (RPM); append -platform to Debian pkg name
Date Fri, 14 Jul 2017 05:36:45 GMT
This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git


The following commit(s) were added to refs/heads/master by this push:
     new 0f091e9  Use $VERSION for version name (RPM); append -platform to Debian pkg name
0f091e9 is described below

commit 0f091e936568215bba31a8657e9b1f82514f064a
Author: Joan Touzet <wohali@apache.org>
AuthorDate: Fri Jul 14 05:35:54 2017 +0000

    Use $VERSION for version name (RPM); append -platform to Debian pkg name
---
 Makefile               | 7 ++++---
 README.md              | 2 +-
 rpm/SPECS/couchdb.spec | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 1e0e6dc..d56da58 100644
--- a/Makefile
+++ b/Makefile
@@ -62,8 +62,9 @@ build-couch:
 find-couch-dist:
 	$(eval ORIGDISTDIR := $(shell cd $(COUCHDIR) && find . -type d -name apache-couchdb-\*))
 	$(eval NEWDIR := $(shell echo $(ORIGDISTDIR) | sed 's/.\/apache-couchdb/couchdb/'))
-	mv $(COUCHDIR)/$(ORIGDISTDIR) $(COUCHDIR)/$(NEWDIR)
-	$(eval DISTDIR := $(shell readlink -f $(COUCHDIR)/$(NEWDIR)))
+        $(eval VERSION := $(shell echo $(ORIGDISTDIR) | sed 's/.\/apache-couchdb-//'))
+	mv $(COUCHDIR)/$(ORIGDISTDIR) $(COUCHDIR)/$(NEWDIR)-$(PLATFORM)
+	$(eval DISTDIR := $(shell readlink -f $(COUCHDIR)/$(NEWDIR)-$(PLATFORM)))
 
 copy-debian:
 	rm -rf $(DISTDIR)/debian
@@ -89,7 +90,7 @@ make-rpmbuild:
 	cp -R rpm/* ~/rpmbuild
 
 build-rpm:
-	cd ~/rpmbuild && rpmbuild --verbose -bb SPECS/couchdb.spec --define "erlang_version
$(ERLANG_VERSION)"
+	cd ~/rpmbuild && rpmbuild --verbose -bb SPECS/couchdb.spec --define "erlang_version
$(ERLANG_VERSION)" --define '_version $(VERSION)'
 
 # ######################################
 make-js185:
diff --git a/README.md b/README.md
index ed97d67..e7c1c4a 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Quickstart:
 
 ```shell
 $ cd .. && git clone https://github.com/apache/couchdb
-$ cd couchdb-pkg && make build-couch $(lsb_release -cs)
+$ cd couchdb-pkg && make build-couch $(lsb_release -cs) PLATFORM=$(lsb_release -cs)
 ```
 
 # Feedback, Issues, Contributing
diff --git a/rpm/SPECS/couchdb.spec b/rpm/SPECS/couchdb.spec
index 794bcaa..541af22 100644
--- a/rpm/SPECS/couchdb.spec
+++ b/rpm/SPECS/couchdb.spec
@@ -17,7 +17,7 @@
 Summary:       RESTful document oriented database
 License:       Apache License v2.0
 Name:          %{name}
-Version:       2.0.0
+Version:       ${_version}
 Release:       1%{?dist}
 Source:        https://www.apache.org/dist/couchdb/source/${version}/apache-couchdb-%{version}.tar.gz
 Source1:       %{name}.service

-- 
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <commits@couchdb.apache.org>'].

Mime
View raw message