add %py_postclean(x:) to minirpm

[packages/rpm-build-tools.git] / builder.sh

diff --git a/builder.sh b/builder.sh
index 5bbbfc9bf1147dc43faa256809c9d875efd30de1..fb0606d86faf788172ab4daba683109456113795 100755 (executable)
--- a/builder.sh
+++ b/builder.sh
@@ -39,7 +39,7 @@ RCSID='$Id: builder,v 1.645 2011/02/13 17:54:10 glen Exp $' r=${RCSID#* * } rev=
 VERSION="v0.35/$rev"
 VERSIONSTRING="\
 Build package utility from PLD Linux Packages repository
-$VERSION (C) 1999-2012 Free Penguins".
+$VERSION (C) 1999-2013 Free Penguins".
 
 CLEAN_PATH="/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin"
 
@@ -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
@@ -511,11 +511,11 @@ teeboth() {
                local efile rc logfile=$1; shift
                if [ "$logfile" ]; then
                        efile=$(tempfile)
-                       { "$@" < /dev/null 2>&1; echo $? > $efile; } | tee -a $logfile
+                       { "$@" 2>&1; echo $? > $efile; } | tee -a $logfile
                        rc=$(< $efile)
                        rm -f $efile
                else
-                       "$@" < /dev/null
+                       "$@"
                        rc=$?
                fi
        fi
@@ -605,6 +605,7 @@ minirpm() {
 %releq_kernel_up(n:) ERROR
 %releq_kernel_smp(n:) ERROR
 %releq_kernel(n:) ERROR
+%py_postclean(x:) ERROR
 %kgcc_package ERROR
 %_fontsdir ERROR
 %ruby_version ERROR
@@ -906,7 +907,7 @@ get_spec() {
        fi
 
        cd "$REPO_DIR"
-
+       SPECFILE=$(basename $SPECFILE)
        if [ "$NOCVSSPEC" != "yes" ]; then
                if [ -z "$DEPTH" ]; then
                        if [ -d "$PACKAGE_DIR/.git" ]; then
@@ -1052,7 +1053,7 @@ src_md5() {
        # use "sources" file from package dir, like vim
        if [ -f sources ]; then
                md5=$(grep -s -v '^#' sources | \
-               grep -E "[      ]$(basename "$1")([     ,]|\$)" | \
+               grep -E "[      *]$(basename "$1")([    ,]|\$)" | \
                sed -e 's/^\([0-9a-f]\{32\}\).*/\1/' | \
                grep -E '^[0-9a-f]{32}$')