X-Git-Url: https://git.tld-linux.org/?p=packages%2Frpm-build-tools.git;a=blobdiff_plain;f=builder.sh;fp=builder.sh;h=a091ffcd40e8dc73221d0dd19c79e6ea6cb4be07;hp=1d876e589f1b12ec841a419cd0a14ea53a1f563c;hb=1f4dc0c2b6777b4af478bada8b44fb3064f33e50;hpb=dbb862e4ac5a88826c43d8f48e265e5f3238174d diff --git a/builder.sh b/builder.sh index 1d876e5..a091ffc 100755 --- a/builder.sh +++ b/builder.sh @@ -1757,7 +1757,7 @@ build_package() { # 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 's/^Release:\s+(.*)$/Release:\t\1%{?tld}/' $specdir/$SPECFILE + sed -i -r -e '/^Release:/s/%\{\?tld\}//g; s/^Release:\s+(.*)$/Release:\t\1%{?tld}/;' $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 $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $specdir/$SPECFILE retval=$?