From: Marcin Krol <hawk@tld-linux.org>
Date: Sat, 20 Mar 2021 11:47:16 +0000 (+0100)
Subject: - always disable systemd bcond at build time
X-Git-Url: https://git.tld-linux.org/?p=packages%2Frpm-build-tools.git;a=commitdiff_plain;h=481879772435a1632563d0d2a65c90fe5b7d9d0b;hp=4a622468cc1a2fe34b00641538f04d4d2bdf0b8b

- always disable systemd bcond at build time
---

diff --git a/builder.sh b/builder.sh
index 14f317a..787e216 100755
--- a/builder.sh
+++ b/builder.sh
@@ -1754,6 +1754,10 @@ build_package() {
 	if grep -q -E 'systemd(unitdir|userunitdir|tmpfilesdir)' $specdir/$SPECFILE; then
 		sed -i -e '/^%exclude_systemd_files/d; /^%files/s/$/\n%exclude_systemd_files/g;' $specdir/$SPECFILE
 	fi
+	# Disable systemd bcond if present and enabled, there is no systemd in TLD
+	if grep -q -E '^%bcond_without\s+systemd\s+' $specdir/$SPECFILE; then
+		sed -i -r -e '/^%bcond_without\s+systemd\s+/s/bcond_without/bcond_with/g;' $specdir/$SPECFILE
+	fi
 	# FIXME: eval here is exactly why?
 	PATH=$CLEAN_PATH eval teeboth "'$logfile'" ${TIME_COMMAND} ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $specdir/$SPECFILE
 	retval=$?