public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/systemd] rawhide: Disable the standalone report yet again
Date: Mon, 06 Jul 2026 22:46:34 GMT [thread overview]
Message-ID: <178337799405.1.3838329174769796717.rpms-systemd-2382c910b709@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/systemd
Branch : rawhide
Commit : 2382c910b70921c8b7da3dec0bfe30580490e920
Author : Zbigniew Jędrzejewski-Szmek <zbyszek@amutable.com>
Date : 2026-07-07T00:45:42+02:00
Stats : +8/-5 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/systemd/c/2382c910b70921c8b7da3dec0bfe30580490e920?branch=rawhide
Log:
Disable the standalone report yet again
It should be disabled until the changes are merged upstream.
Also fix and adjust the conditions for package-note use.
[skip changelog]
---
diff --git a/systemd.spec b/systemd.spec
index e766080..23ded1b 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -31,6 +31,9 @@
# Build with OBS-specific quirks
%bcond obs 0
+# Temporary macro to enable systemd-report.standalone
+%bcond report_standalone 0
+
# When bootstrap, libcryptsetup is disabled
# but auto-features causes many options to be turned on
# that depend on libcryptsetup (e.g. libcryptsetup-plugins, homed)
@@ -175,10 +178,10 @@ BuildRequires: cryptsetup-devel
BuildRequires: systemd-rpm-macros
%endif
-%if 0%{?rhel} <= 10
+%if 0%{?rhel} == 0 || 0%{?rhel} > 10
# Use dlopen-notes to generate Requires/Recommends from embedded metadata.
# Currently, package-notes are not available on Centos Stream 9 or 10.
-BuildRequires: package-notes >= 0.18
+BuildRequires: package-notes >= 0.20
%endif
BuildRequires: dbus-devel
@@ -332,7 +335,7 @@ Conflicts: dracut < 060-2
Conflicts: dracut < 059-16
%endif
-%if %{with upstream}
+%if %{with report_standalone}
Conflicts: systemd-standalone-report
Provides: systemd-report = %{version}-%{release}
%endif
@@ -745,7 +748,7 @@ Standalone systemd-repart binary with no dependencies on the systemd-shared
library or other libraries from systemd-libs. This package conflicts with the
systemd-udev package and is meant for use on systems without systemd-udev.
-%if %{with upstream}
+%if %{with report_standalone}
%package standalone-report
Summary: Standalone systemd-report binaries for use on systems without systemd
Provides: systemd-report = %{version}-%{release}
@@ -1587,7 +1590,7 @@ fi
%files standalone-repart -f .file-list-standalone-repart
-%if %{with upstream}
+%if %{with report_standalone}
%files standalone-report -f .file-list-standalone-report
%endif
reply other threads:[~2026-07-06 22:46 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=178337799405.1.3838329174769796717.rpms-systemd-2382c910b709@fedoraproject.org \
--to=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