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 25b68af fix CI package builds for centos
25b68af is described below
commit 25b68af616486713a0f3e50304cf2eec2b35d257
Author: Joan Touzet <[email protected]>
AuthorDate: Thu Feb 13 14:05:50 2020 -0800
fix CI package builds for centos
---
Makefile | 14 +++++++-------
rpm/SPECS/couchdb.spec | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 54159b5..d1c33ca 100644
--- a/Makefile
+++ b/Makefile
@@ -98,22 +98,22 @@ centos: PKGDIR=../rpmbuild/RPMS/$(PKGARCH)
centos: find-couch-dist link-couch-dist build-rpm copy-pkgs
centos-6: DIST=centos-6
-centos-6: SPIDERMONKEY=couch-js = 1:1.8.5
-centos-6: SPIDERMONKEY_DEV=couch-js-devel = 1:1.8.5
centos-6: centos6
+centos6: SPIDERMONKEY=couch-js = 1:1.8.5
+centos6: SPIDERMONKEY_DEV=couch-js-devel = 1:1.8.5
centos6: sm-ver-rpm make-rpmbuild centos
centos-7: DIST=centos-7
-centos-7: SPIDERMONKEY=couch-js = 1:1.8.5
-centos-7: SPIDERMONKEY_DEV=couch-js-devel = 1:1.8.5
centos-7: centos7
+centos7: SPIDERMONKEY=couch-js = 1:1.8.5
+centos7: SPIDERMONKEY_DEV=couch-js-devel = 1:1.8.5
centos7: sm-ver-rpm make-rpmbuild centos
centos-8: DIST=centos-8
-centos-8: SPIDERMONKEY=mozjs60
-centos-8: SPIDERMONKEY_DEV=mozjs60-devel
-centos-8: SM_VER=60
centos-8: centos8
+centos8: SPIDERMONKEY=mozjs60
+centos8: SPIDERMONKEY_DEV=mozjs60-devel
+centos8: SM_VER=60
centos8: sm-ver-rpm make-rpmbuild centos
openSUSE: centos7
diff --git a/rpm/SPECS/couchdb.spec b/rpm/SPECS/couchdb.spec
index 7b50e74..aefd7ba 100644
--- a/rpm/SPECS/couchdb.spec
+++ b/rpm/SPECS/couchdb.spec
@@ -93,7 +93,7 @@ languages and environments.
%define __os_install_post %{nil}
%build
-./configure -c --spidermonkey-version=%SM_VER%
+./configure -c --spidermonkey-version=1.8.5
%{__make} release
%clean
