Skip to content
Permalink
Browse files
Use $VERSION for version name (RPM); append -platform to Debian pkg name
  • Loading branch information
wohali committed Jul 14, 2017
1 parent 780a37b commit 6480aa5e2181b0b509598bdac6e7be8d0babfd8a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
@@ -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
@@ -82,14 +83,15 @@ lintian:
link-couch-dist:
rm -rf ~/rpmbuild/BUILD
ln -s $(DISTDIR) ~/rpmbuild/BUILD
$(eval VERSION := $(shell echo $(VERSION) | sed 's/-/\./'))

make-rpmbuild:
rm -rf ~/rpmbuild
mkdir -p ~/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:
@@ -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
@@ -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

0 comments on commit 6480aa5

Please sign in to comment.