This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git
The following commit(s) were added to refs/heads/main by this push:
new 78bef23 feat: Add convenience binary packages for el10
78bef23 is described below
commit 78bef23a9a57cbad05af60c7182f226d0db4f650
Author: Ronny Berndt <[email protected]>
AuthorDate: Thu Feb 19 10:29:25 2026 +0100
feat: Add convenience binary packages for el10
---
Makefile | 52 ++++++++++++++++++++++++-----------------------
debian/control.in | 2 --
rpm/SPECS/couchdb.spec.in | 27 +++++++++++++-----------
3 files changed, 42 insertions(+), 39 deletions(-)
diff --git a/Makefile b/Makefile
index 321da49..02b8711 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,6 @@ COUCHDIR=../couchdb
DEBCHANGELOG="Automatically generated package from upstream."
JS_DEBCHANGELOG="Automatically generated package from couchdb-ci repository."
-JS_VERSION=1.8.5-1.0.0+couch-2
export DEBFULLNAME="CouchDB Developers"
export DEBEMAIL="[email protected]"
@@ -34,6 +33,7 @@ endif
SPIDERMONKEY=couch-libmozjs185-1.0
SPIDERMONKEY_DEV=couch-libmozjs185-dev
SM_VER=1.8.5
+JS_ENGINE=spidermonkey
# Java
JAVA_RUNTIME=java11-runtime-headless | java11-runtime
@@ -196,6 +196,11 @@ centos9: SPIDERMONKEY_DEV=mozjs78-devel
centos9: SM_VER=78
centos9: sm-ver-rpm make-rpmbuild centos
+centos-10: DIST=centos-10
+centos-10: centos10
+centos10: JS_ENGINE=quickjs
+centos10: sm-ver-rpm make-rpmbuild centos
+
# Almalinux 8 is a CentOS 8 alias
almalinux-8: centos-8
almalinux-8.8: centos-8
@@ -212,12 +217,15 @@ almalinux-9.2: centos-9
almalinux-9.4: centos-9
almalinux-9.5: centos-9
almalinux-9.6: centos-9
+almalinux-9.7: centos-9
aarch64-almalinux-9.4: PKGARCH=aarch64
aarch64-almalinux-9.4: centos-9
aarch64-almalinux-9.5: PKGARCH=aarch64
aarch64-almalinux-9.5: centos-9
aarch64-almalinux-9.6: PKGARCH=aarch64
aarch64-almalinux-9.6: centos-9
+aarch64-almalinux-9.7: PKGARCH=aarch64
+aarch64-almalinux-9.7: centos-9
aarch64-almalinux-9: PKGARCH=aarch64
aarch64-almalinux-9: centos-9
# s390x RHEL 8 clone based
@@ -230,6 +238,23 @@ arm64-centos-9: PKGARCH=aarch64
arm64-centos-9: centos-9
ppc64le-centos-9: centos-9
+# Almalinux 10 is a CentOS 10 alias
+almalinux-10: centos-10
+almalinux-10.1: centos-10
+aarch64-almalinux-10: PKGARCH=aarch64
+aarch64-almalinux-10: centos-10
+aarch64-almalinux-10.1: PKGARCH=aarch64
+aarch64-almalinux-10.1: centos-10
+# s390x RHEL 10 clone based
+s390x-centos-10: centos-10
+ppc64le-centos-10: centos-10
+# s390x RHEL 10 clone based
+s390x-centos-10: centos-10
+
+arm64-centos-10: PKGARCH=aarch64
+arm64-centos-10: centos-10
+ppc64le-centos-10: centos-10
+
# aarch64 RHEL-based
aarch64-rhel: DIST=rhel
# Needs 68 for aarch compat, we're using the included one here
@@ -299,7 +324,7 @@ make-rpmbuild:
# If we don't change $HOME it'll force building in ~/rpmbuild. Boo.
build-rpm:
$(eval HOME := $(shell readlink -f ..))
- export HOME=$(HOME) && cd ../rpmbuild && rpmbuild --verbose -bb
SPECS/couchdb.spec --define '_version $(VERSION)'
+ export HOME=$(HOME) && cd ../rpmbuild && rpmbuild --verbose -bb
SPECS/couchdb.spec --define '_version $(VERSION)' --define '_js_engine
$(JS_ENGINE)'
# ######################################
copy-pkgs:
@@ -311,26 +336,3 @@ clean:
if [ -f debian/control.bak ]; then mv -f debian/control.bak
debian/control; fi
if [ -f rpm/SPECS/couchdb.spec.bak ]; then mv -f
rpm/SPECS/couchdb.spec.bak rpm/SPECS/couchdb.spec; fi
rm -rf parts prime stage js/build debian/sm_ver.mk
-
-# ######################################
-couch-js-clean:
- rm -rf js/build ../rpmbuild
-
-couch-js-debs: couch-js-clean
- mkdir js/build && cd js/build && tar xf ../src/js185-1.0.0.tar.gz
--strip-components=1
- cp -r js/debian js/build
- if [ "$(shell arch)" = "armv7l" ]; then rm js/build/debian/*symbols; fi
- cd js/build && dch -v $(JS_VERSION)~$(PLATFORM) $(JS_DEBCHANGELOG)
- cd js/build && dpkg-buildpackage -b -us -uc
-
-couch-js-rpms: couch-js-clean
- mkdir -p ../rpmbuild
- cp -R js/rpm/* ../rpmbuild
- cp js/src/js185-1.0.0.tar.gz ../rpmbuild/SOURCES
- cd ../rpmbuild && rpmbuild --verbose -bb SPECS/js.spec
-
-couch-js-68-rpms: couch-js-clean
- mkdir -p ../rpmbuild
- cp -R js68/rpm/* ../rpmbuild
- cd ../rpmbuild/SOURCES && curl -O
https://ftp.mozilla.org/pub/firefox/releases/68.12.0esr/source/firefox-68.12.0esr.source.tar.xz
- cd ../rpmbuild && rpmbuild --verbose -bb SPECS/js68.spec
diff --git a/debian/control.in b/debian/control.in
index bc0e0ab..75d525e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -14,8 +14,6 @@ Build-Depends: debhelper (>= 10),
erlang-reltool | esl-erlang,
erlang-syntax-tools | esl-erlang,
git,
- help2man,
- libcurl4-openssl-dev,
libicu-dev,
%SPIDERMONKEY_DEV%,
lsb-release,
diff --git a/rpm/SPECS/couchdb.spec.in b/rpm/SPECS/couchdb.spec.in
index 571c380..81b3107 100644
--- a/rpm/SPECS/couchdb.spec.in
+++ b/rpm/SPECS/couchdb.spec.in
@@ -33,25 +33,22 @@ Exclusiveos: linux
Packager: CouchDB Developers <[email protected]>
Patch1: 0001-build-with-sm68-on-aarch64.patch
-BuildRequires: esl-erlang
-BuildRequires: gcc
Requires(pre): shadow-utils
+BuildRequires: esl-erlang
+BuildRequires: gcc
BuildRequires: git
-BuildRequires: help2man
-BuildRequires: libcurl-devel
-BuildRequires: libicu-devel
-BuildRequires: nodejs >= 6.10.1
BuildRequires: java-21-openjdk-devel
+BuildRequires: libicu-devel
-Requires(post): curl
-Requires(post): %SPIDERMONKEY%
Requires(post): libicu >= 4.2.1
-Requires(post): procps
+
+%if 0%{?rhel} < 10
+Requires(post): %SPIDERMONKEY%
+%endif
Suggests: java-21-openjdk-headless
-BuildRequires: xfsprogs-devel
%{?systemd_requires}
BuildRequires: systemd
@@ -74,10 +71,16 @@ languages and environments.
%prep
%build
+if [ %{_js_engine} = quickjs ]; then
+ conf_args="--disable-spidermonkey --js-engine=quickjs"
+else
+ conf_args="--spidermonkey-version=%SM_VER%"
+fi
+
if [ -d ./nouveau -o -d ./extra/nouveau ]; then
- ./configure --spidermonkey-version=%SM_VER% --with-nouveau
+ ./configure "$conf_args --with-nouveau"
else
- ./configure --spidermonkey-version=%SM_VER%
+ ./configure "$conf_args"
fi
%{__make} release
