ensure unified changelog (rpm %changelog format) for produced src.rpms for git and...

diff --git a/builder.sh b/builder.sh
index d11207fd71f0786ac069509c895f3ab2b7e87578..80856148f6f78f89f7e77a314cdcbb3796e1d6e2 100755 (executable)
--- a/builder.sh
+++ b/builder.sh
@@ -473,8 +473,8 @@ insert_gitlog() {
        # * 1265749244 +0000 Random Hacker <nikt@pld-linux.org> 9370900
        git rev-list --date-order -${log_entries:-20} HEAD 2>/dev/null | while read sha1; do
                local logfmt='%B%n'
-               git notes list $sha1 > /dev/null 2>&1 && logfmt=%N
-               git log -n 1 $sha1 --format=format:"* %ad %an <%ae> %h%n${logfmt}%n" --date=raw | sed '/^$/q'
+               git notes list $sha1 > /dev/null 2>&1 && logfmt='%N'
+               git log -n 1 $sha1 --format=format:"* %ad %an <%ae> %h%n- ${logfmt}%n" --date=raw | sed -re 's/^- +- */- /'| sed '/^$/q'
        done > $gitlog
 
        # add link to full git logs