(couchdb-pkg) branch add-el10-pkgs updated (8cfe67d -> 743eb58)

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ronny pushed a change to branch add-el10-pkgs
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git


 discard 8cfe67d  feat: Add convenience binary packages for el10
     new 743eb58  feat: Add convenience binary packages for el10

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (8cfe67d)
            \
             N -- N -- N   refs/heads/add-el10-pkgs (743eb58)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Makefile | 1 -
 1 file changed, 1 deletion(-)

(couchdb-pkg) 01/01: feat: Add convenience binary packages for el10

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ronny pushed a commit to branch add-el10-pkgs
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git

commit 743eb587481fba8e76ca5324b27913ae9dbf44d6
Author: Ronny Berndt <ro...@apache.org>
AuthorDate: Thu Feb 19 10:29:25 2026 +0100

    feat: Add convenience binary packages for el10
---
 Makefile                  | 22 ++++++++++++++++++++++
 rpm/SPECS/couchdb.spec.in | 12 ++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 321da49..bb57236 100644
--- a/Makefile
+++ b/Makefile
@@ -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: DISABLE_SPIDERMONKEY=true
+centos10: sm-ver-rpm make-rpmbuild centos
+
 # Almalinux 8 is a CentOS 8 alias
 almalinux-8: centos-8
 almalinux-8.8: centos-8
@@ -230,6 +235,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
diff --git a/rpm/SPECS/couchdb.spec.in b/rpm/SPECS/couchdb.spec.in
index 571c380..1051206 100644
--- a/rpm/SPECS/couchdb.spec.in
+++ b/rpm/SPECS/couchdb.spec.in
@@ -45,7 +45,9 @@ BuildRequires: nodejs >= 6.10.1
 BuildRequires: java-21-openjdk-devel
 
 Requires(post): curl
+%if 0%{?rhel} < 10
 Requires(post): %SPIDERMONKEY%
+%endif
 Requires(post): libicu >= 4.2.1
 Requires(post): procps
 
@@ -74,10 +76,16 @@ languages and environments.
 %prep
 
 %build
+if [ -z ${DISABLE_SPIDERMONKEY} ]; then
+    conf_args="--disable-spidermonkey --JSEngine=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