You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2017/07/14 06:39:10 UTC
[couchdb-pkg] branch master updated (8e09fc6 -> d95f7cb)
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git.
discard 8e09fc6 Use $VERSION for version name (RPM); append -platform to Debian pkg name
new d95f7cb Use $VERSION for version name (RPM); append -platform to Debian pkg name
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (8e09fc6)
\
N -- N -- N refs/heads/master (d95f7cb)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
rpm/SPECS/couchdb.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].
[couchdb-pkg] 01/01: Use $VERSION for version name (RPM);
append -platform to Debian pkg name
Posted by wo...@apache.org.
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
commit d95f7cbd121c6a2f6f57e1f6f7ebf723169b719e
Author: Joan Touzet <wo...@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..c5aa2e2 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..52c0849 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" <co...@couchdb.apache.org>.