From ab7e43f970a592f34b7752635f1745bdb7e76b3a Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Sat, 19 Apr 2025 10:48:34 +0200
Subject: [PATCH] - really fix %files and tld release modifiers regexes

---
 builder.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builder.sh b/builder.sh
index 265c6a0..e859f5d 100755
--- a/builder.sh
+++ b/builder.sh
@@ -1695,12 +1695,12 @@ build_package() {
 	ulimit -c unlimited
 	# If required exclude directories with systemd related files from package contents
 	if grep -q -E '(lib/(systemd|binfmt.d|sysctl.d|sysusers.d|tmpfiles.d)|systemd(unitdir|userunitdir|tmpfilesdir))' $specdir/$SPECFILE; then
-		sed -i -r -e '/^%exclude_systemd_files/d; /^%files/s/(\\+)$/\1\n%exclude_systemd_files\1/g;' $specdir/$SPECFILE
+		sed -i -r -e '/^%exclude_systemd_files/d; /^%files/s/(\\*)$/\1\n%exclude_systemd_files\1/g;' $specdir/$SPECFILE
 	fi
 	# Enable/disable distro wide bconds based on ~/.distbcond
 	process_distbcond "$specdir/$SPECFILE"
 	# Add %tld macro to release to allow release control
-	sed -i -r -e '/^Release:/s/%\{\?tld\}//g; s/^Release:\s+(.*)(\\+)$/Release:\t\1%{?tld}\2/;' $specdir/$SPECFILE
+	sed -i -r -e '/^Release:/s/%\{\?tld\}//g; s/^Release:\s+([^\\]*)(\\*)$/Release:\t\1%{?tld}\2/;' $specdir/$SPECFILE
 	# 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 $RPMUSERDEFS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $specdir/$SPECFILE
 	retval=$?
-- 
2.49.0