public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Yaakov Selkowitz <yselkowi@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/c-icap] rawhide: Fix build on RHEL 11
Date: Mon, 03 Aug 2026 04:27:47 GMT [thread overview]
Message-ID: <178573126747.1.18367296349954691181.rpms-c-icap-b57d3ae96bfe@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/c-icap
Branch : rawhide
Commit : b57d3ae96bfe1c25ed3a9f1a5f71b73f3f30355f
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date : 2026-07-27T20:09:55-04:00
Stats : +5/-5 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/c-icap/c/b57d3ae96bfe1c25ed3a9f1a5f71b73f3f30355f?branch=rawhide
Log:
Fix build on RHEL 11
RHEL 11 inherits the following Fedora 42 changes which affect the build:
https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers
https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin
---
diff --git a/c-icap.spec b/c-icap.spec
index f017a10..5d6c0f1 100644
--- a/c-icap.spec
+++ b/c-icap.spec
@@ -39,7 +39,7 @@ BuildRequires: systemd-rpm-macros
BuildRequires: zlib-devel
Requires: logrotate
-%if 0%{?fedora} < 42
+%if ! (0%{?fedora} >= 42 || 0%{?rhel} >= 11)
Requires(pre): shadow-utils
%endif
@@ -121,7 +121,7 @@ mkdir -p %{buildroot}%{_localstatedir}/log/%{name}/
mkdir -p %{buildroot}/run/%{name}/
# Required before bin/sbin merge in F42
-%if 0%{?fedora} < 42
+%if ! (0%{?fedora} >= 42 || 0%{?rhel} >= 11)
mv -f %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}/
%endif
@@ -129,7 +129,7 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_tmpfilesdir}/%{name}.conf
install -D -p -m 0644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}.service
-%if 0%{?fedora} >= 42
+%if 0%{?fedora} >= 42 || 0%{?rhel} >= 11
install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/%{name}.conf
%endif
@@ -141,7 +141,7 @@ rm -fr %{buildroot}%{_docdir}/%{name}
# Required prior to sysusers.d support in F42
-%if 0%{?fedora} < 42
+%if ! (0%{?fedora} >= 42 || 0%{?rhel} >= 11)
%pre
getent group %{name} >/dev/null || groupadd -r %{name}
getent passwd %{name} >/dev/null ||
@@ -197,7 +197,7 @@ exit 0
%{_unitdir}/%{name}.service
%attr(750,%{name},%{name}) %dir %{_localstatedir}/log/%{name}
-%if 0%{?fedora} >= 42
+%if 0%{?fedora} >= 42 || 0%{?rhel} >= 11
%{_sysusersdir}/%{name}.conf
%endif
reply other threads:[~2026-08-03 4:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178573126747.1.18367296349954691181.rpms-c-icap-b57d3ae96bfe@fedoraproject.org \
--to=yselkowi@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox