Changeset 652 for trunk/tools/svn2build


Ignore:
Timestamp:
Jun 8, 2006, 2:15:09 PM (13 years ago)
Author:
bcornec
Message:

merge -r641:651 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/svn2build

    r649 r652  
    5454
    5555        ddd=`LANG=C ; date '+%Y-%m-%d'`
    56         cat > /tmp/mondorescue.mc << EOF
     56        cat > $TMP/mondorescue.mc << EOF
    5757define(\`TTT', ${TAG})dnl
    5858define(\`RRR', ${TAG}${suf})dnl
     
    7272            fi
    7373            echo "Using $inc customization to build SPEC file"
    74             m4 /tmp/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
     74            m4 $TMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
    7575
    76             $TOOLHOME/mkchangelog.pl $dtype $p $dest/distributions/${ddir}-$dver/$p.spec
     76            $TOOLHOME/mkchangelog.pl $dtype $p $TMP/$p.spec
    7777            if [ $? -ne 0 ]; then
    7878                echo "Unable to create changelog for ${ddir}-$dver/$p.spec"
    7979                exit -1
    8080            fi
    81 
    82             ddate=`LANG=C ; date "+%a %b %d %Y"`
    83             cat > $dest/distributions/${ddir}-$dver/$p.changelog.new << EOF
    84 * $ddate Bruno Cornec <bruno@mondorescue.org> VVV-RRR
    85 - Updated to VVV-r${REVISION}
    86 
    87 EOF
     81            cat $TMP/$p.spec >> $dest/distributions/${ddir}-$dver/$p.spec
     82            rm -f $TMP/$p.spec
    8883        elif [ "$dtype" = "ebuild" ]; then
    89             m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v-r$TAG.ebuild
     84            m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v-r$TAG.ebuild
    9085        elif [ "$dtype" = "deb" ]; then
    9186            # To be developped
    92             m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p > /dev/null
     87            m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p > /dev/null
    9388        else
    9489            echo "Unknown Build"
     
    9994        cd $dest
    10095        for f in mondorescue-howto.sgml *8; do
    101             m4 /tmp/mondorescue.mc $f > ${f}.new
     96            m4 $TMP/mondorescue.mc $f > ${f}.new
    10297            mv ${f}.new $f
    10398        done
     
    139134done
    140135
    141 rm -f /tmp/mondorescue.mc
     136rm -f $TMP/mondorescue.mc
    142137
    143138echo "Version delivered :"
Note: See TracChangeset for help on using the changeset viewer.