- fix some corner cases in systemd file excludes and TLD release modifiers

diff --git a/builder.sh b/builder.sh
index b022e1f062c7d1d98c133c620336f424647acae1..265c6a07238f0fd468e535a4c2bf8d17f13db88b 100755 (executable)
--- 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 -e '/^%exclude_systemd_files/d; /^%files/s/$/\n%exclude_systemd_files/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}/;' $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=$?