Skip to content
Permalink
Browse files
Ensure correct SM version substitution
  • Loading branch information
wohali committed Feb 27, 2020
1 parent 5a49443 commit 15613fa0e4380960651ac211d0498cfc57981bc6
Showing 4 changed files with 6 additions and 4 deletions.
@@ -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
@@ -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
File renamed without changes.
@@ -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

0 comments on commit 15613fa

Please sign in to comment.