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 2020/02/27 17:15:20 UTC
[couchdb-pkg] branch master updated: Ensure correct SM version
substitution
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 15613fa Ensure correct SM version substitution
15613fa is described below
commit 15613fa0e4380960651ac211d0498cfc57981bc6
Author: Joan Touzet <wo...@apache.org>
AuthorDate: Thu Feb 27 09:15:05 2020 -0800
Ensure correct SM version substitution
---
.gitignore | 2 ++
Makefile | 4 ++--
debian/{control => control.in} | 0
rpm/SPECS/{couchdb.spec => couchdb.spec.in} | 4 ++--
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index 944cddd..52e94ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+debian/control
debian/*.log
debian/*.debhelper
debian/*.substvars
@@ -10,6 +11,7 @@ rpm/BUILD
rpm/BUILDROOT
rpm/RPMS
rpm/SRPMS
+rpm/SPECS/couchdb.spec
repo/db
repo/dists
repo/pool
diff --git a/Makefile b/Makefile
index d1c33ca..ab84618 100644
--- a/Makefile
+++ b/Makefile
@@ -138,7 +138,7 @@ build-couch:
# ######################################
sm-ver-debian:
- cp debian/control debian/control.bak
+ cp debian/control.in debian/control
sed -i 's/%SPIDERMONKEY%/$(SPIDERMONKEY)/g' debian/control
sed -i 's/%SPIDERMONKEY_DEV%/$(SPIDERMONKEY_DEV)/g' debian/control
echo 'SM_VER = $(SM_VER)' > debian/sm_ver.mk
@@ -168,7 +168,7 @@ link-couch-dist:
$(eval VERSION := $(shell echo $(VERSION) | sed 's/-/\./'))
sm-ver-rpm:
- cp rpm/SPECS/couchdb.spec rpm/SPECS/couchdb.spec.bak
+ cp rpm/SPECS/couchdb.spec.in rpm/SPECS/couchdb.spec
sed -i 's/%SPIDERMONKEY%/$(SPIDERMONKEY)/g' rpm/SPECS/couchdb.spec
sed -i 's/%SPIDERMONKEY_DEV%/$(SPIDERMONKEY_DEV)/g' rpm/SPECS/couchdb.spec
sed -i 's/%SM_VER%/$(SM_VER)/g' rpm/SPECS/couchdb.spec
diff --git a/debian/control b/debian/control.in
similarity index 100%
rename from debian/control
rename to debian/control.in
diff --git a/rpm/SPECS/couchdb.spec b/rpm/SPECS/couchdb.spec.in
similarity index 98%
rename from rpm/SPECS/couchdb.spec
rename to rpm/SPECS/couchdb.spec.in
index 7b50e74..e57da78 100644
--- a/rpm/SPECS/couchdb.spec
+++ b/rpm/SPECS/couchdb.spec.in
@@ -52,13 +52,13 @@ Requires(pre): shadow-utils
BuildRequires: git
BuildRequires: help2man
-#BuildRequires: mozjs60-devel
+#BuildRequires: %SPIDERMONKEY_DEV%
BuildRequires: libcurl-devel
BuildRequires: libicu-devel
BuildRequires: nodejs >= 6.10.1
Requires(post): curl
-Requires(post): mozjs60
+Requires(post): %SPIDERMONKEY%
Requires(post): libicu >= 4.2.1
Requires(post): procps