[rpms/389-ds-base] rawhide: Fix ELN build

[rpms/389-ds-base] rawhide: Fix ELN build

[Yaakov Selkowitz]

            A new commit has been pushed.

            Repo   : rpms/389-ds-base
            Branch : rawhide
            Commit : cdab382b643384c26baa7e8a0d6d84c7c9774a45
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2026-09-08T21:58:09-04:00
            Stats  : +3/-5 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/389-ds-base/c/cdab382b643384c26baa7e8a0d6d84c7c9774a45?branch=rawhide

            Log:
            Fix ELN build

As it adds no extra dependencies not already in RHEL, ELN should build the
cockpit plugin for testing purposes (but not shipped in AppStream), as it
does not have the mechanism for building the same package in multiple
configurations.

Also, libdb requires -std=gnu99 on RHEL 11 as well, as it has the latest
gcc which defaults to C23, with which libdb's old codebase is not compatible.

Finally, RHEL 11 also includes the bin-sbin merge, and therefore needs to be
handled accordingly with respect to the binaries.

---
diff --git a/389-ds-base.spec b/389-ds-base.spec
index 892e5d6..70539c7 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -61,9 +61,9 @@ ExcludeArch: i686
 %endif
 
 # Build cockpit plugin
-# Enabled on Fedora and EPEL community builds.
+# Enabled on Fedora, ELN, and EPEL community builds.
 # Disabled on RHEL/CentOS Stream unless RHDS (distribution contains "dsrv").
-%if 0%{?rhel} && !0%{?epel}
+%if 0%{?rhel} && !0%{?epel} && !0%{?eln}
 %bcond cockpit %(echo "%{?distribution}" | grep -q dsrv && echo 1 || echo 0)
 %else
 %bcond cockpit 1
@@ -712,9 +712,7 @@ mkdir -p ../%{libdb_base_version}
 pushd ../%{libdb_base_version}
 tar -xjf %{_topdir}/SOURCES/%{libdb_full_version}.tar.bz2
 mv %{libdb_full_version} SOURCES
-%if 0%{?fedora}
 sed -i -e '/^CFLAGS=/s/-fno-strict-aliasing/& -std=gnu99/' %{_builddir}/%{name}-%{version}/rpm/bundle-libdb.spec.in
-%endif
 rpmbuild  --define "_topdir $PWD" -bc %{_builddir}/%{name}-%{version}/rpm/bundle-libdb.spec.in
 popd
 %endif
@@ -775,7 +773,7 @@ cp -r %{_builddir}/%{name}-%{version}/man/man3 %{buildroot}/%{_mandir}/man3
 # lib389
 pushd src/lib389
 %pyproject_install
-%if 0%{?fedora} <= 41 || (0%{?rhel} && 0%{?rhel} <= 10)
+%if ! (0%{?fedora} >= 42 || 0%{?rhel} >= 11)
 for clitool in dsconf dscreate dsctl dsidm openldap_to_ds; do
     mv %{buildroot}%{_bindir}/$clitool %{buildroot}%{_sbindir}/
 done