From: Marcin Krol <hawk@tld-linux.org>
Date: Sun, 9 May 2021 16:57:59 +0000 (+0200)
Subject: - fix systemd exclude check regex
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=0875cd2f52faf841df4424be1d8ce17597c50fee;p=packages%2Frpm-build-tools.git

- fix systemd exclude check regex
---

diff --git a/builder.sh b/builder.sh
index a5b8edc..587d275 100755
--- a/builder.sh
+++ b/builder.sh
@@ -1688,7 +1688,7 @@ build_package() {
 	local specdir=$(insert_gitlog $SPECFILE)
 	ulimit -c unlimited
 	# If required exclude directories with systemd related files from package contents
-	if grep -q -E 'systemd(unitdir|userunitdir|tmpfilesdir)' $specdir/$SPECFILE; then
+	if grep -q -E '(lib/(systemd|tmpfiles.d)|systemd(unitdir|userunitdir|tmpfilesdir))' $specdir/$SPECFILE; then
 		sed -i -e '/^%exclude_systemd_files/d; /^%files/s/$/\n%exclude_systemd_files/g;' $specdir/$SPECFILE
 	fi
 	# Enable/disable distro wide bconds based on ~/.distbcond