public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/389-ds-base] f44: Fix ELN build
@ 2026-09-09 19:36 Yaakov Selkowitz
  0 siblings, 0 replies; only message in thread
From: Yaakov Selkowitz @ 2026-09-09 19:36 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

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

            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 5b0b5a2..674aa86 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
@@ -710,9 +710,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
@@ -773,7 +771,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

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-09 19:36 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-09 19:36 [rpms/389-ds-base] f44: Fix ELN build Yaakov Selkowitz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox