[rpms/systemd] rawhide: Add missing conditionalization and more debugging

[rpms/systemd] rawhide: Add missing conditionalization and more debugging

[@ 2026-07-03 15:48 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/systemd
            Branch : rawhide
            Commit : 893fcd99787958280f24e68517bc772df49b7fd0
            Author : Zbigniew Jędrzejewski-Szmek <zbyszek@amutable.com>
            Date   : 2026-07-03T17:04:38+02:00
            Stats  : +22/-0 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/systemd/c/893fcd99787958280f24e68517bc772df49b7fd0?branch=rawhide

            Log:
            Add missing conditionalization and more debugging

[skip changelog]

---
diff --git a/systemd.spec b/systemd.spec
index 66d43c1..e00678e 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -323,8 +323,10 @@ Conflicts:      dracut < 060-2
 Conflicts:      dracut < 059-16
 %endif
 
+%if %{with upstream}
 Conflicts:      systemd-standalone-report
 Provides:       systemd-report = %{version}-%{release}
+%endif
 Conflicts:      systemd-standalone-tmpfiles
 Provides:       systemd-tmpfiles = %{version}-%{release}
 Conflicts:      systemd-standalone-shutdown
@@ -746,6 +748,26 @@ library or other libraries from systemd-libs. This package conflicts with the
 main systemd package and is meant for use in exitrds.
 
 %prep
+# Print varius with's and without's to make it easier to figure out what is going on
+echo %{shrink:
+       '**'
+       bzip2=%{?with_bzip2}%{!?with_bzip2:0}
+       gnutls=%{?with_gnutls}%{!?with_gnutls:0}
+       lz4=%{?with_lz4}%{!?with_lz4:0}
+       xz=%{?with_xz}%{!?with_xz:0}
+       zlib=%{?with_zlib}%{!?with_zlib:0}
+       zstd=%{?with_zstd}%{!?with_zstd:0}
+       bootstrap=%{?with_bootstrap}%{!?with_bootstrap:0}
+       tests=%{?with_tests}%{!?with_tests:0}
+       lto=%{?with_lto}%{!?with_lto:0}
+       docs=%{?with_docs}%{!?with_docs:0}
+       upstream=%{?with_upstream}%{!?with_upstream:0}
+       obs=%{?with_obs}%{!?with_obs:0}
+       fedora=%{?fedora}
+       rhel=%{?rhel}
+       _arch=%{_arch}
+       '**'}
+
 %if %{with obs}
 # Recipe files in the OBS build are in a distro-specific dir, as they conflict (e.g. with SUSE ones)
 mv %{_sourcedir}/%{name}.fedora/* %{_sourcedir}