Changeset 649 for trunk/tools/svn2build


Ignore:
Timestamp:
Jun 8, 2006, 11:31:13 AM (13 years ago)
Author:
bcornec
Message:

merge -r617:641 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/svn2build

    r600 r649  
    66#
    77
    8 umask 022
    98dname=`dirname $0`
    109prem=`echo $dname |cut -c1`
     
    7574            m4 /tmp/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
    7675
    77             if [ -f $dest/distributions/$ddir/changelog ]; then
    78                 log=$dest/distributions/$ddir/changelog
    79             elif [ -f $dest/distributions/$dfam/changelog ]; then
    80                 log=$dest/distributions/$dfam/changelog
    81             else
    82                 echo "Unable to build RPM changelog for this distro. Please report to authors"
     76            $TOOLHOME/mkchangelog.pl $dtype $p $dest/distributions/${ddir}-$dver/$p.spec
     77            if [ $? -ne 0 ]; then
     78                echo "Unable to create changelog for ${ddir}-$dver/$p.spec"
    8379                exit -1
    8480            fi
    8581
    86             echo "Using $log customization to build changelog file"
    8782            ddate=`LANG=C ; date "+%a %b %d %Y"`
    8883            cat > $dest/distributions/${ddir}-$dver/$p.changelog.new << EOF
     
    9186
    9287EOF
    93             cat $log >> $dest/distributions/${ddir}-$dver/$p.changelog.new
    94             m4 /tmp/mondorescue.mc $dest/distributions/${ddir}-$dver/$p.changelog.new >> $dest/distributions/${ddir}-${dver}/$p.spec
    95             rm -f $dest/distributions/${ddir}-$dver/$p.changelog.new
    96 
    9788        elif [ "$dtype" = "ebuild" ]; then
    9889            m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v-r$TAG.ebuild
Note: See TracChangeset for help on using the changeset viewer.