Changeset 649 in MondoRescue for trunk/tools/svn2build

Timestamp:

Jun 8, 2006, 11:31:13 AM (18 years ago)

Author:

bcornec

Message:

merge -r617:641 $SVN_M/branches/stable

File:

• trunk/tools/svn2build (modified) (3 diffs)

trunk/tools/svn2build

@@ -6 +6 @@
 #
 
-umask 022
 dname=`dirname $0`
 prem=`echo $dname |cut -c1`
@@ -75 +74 @@
             m4 /tmp/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
 
-            if [ -f $dest/distributions/$ddir/changelog ]; then
-                log=$dest/distributions/$ddir/changelog
-            elif [ -f $dest/distributions/$dfam/changelog ]; then
-                log=$dest/distributions/$dfam/changelog
-            else
-                echo "Unable to build RPM changelog for this distro. Please report to authors"
+            $TOOLHOME/mkchangelog.pl $dtype $p $dest/distributions/${ddir}-$dver/$p.spec
+            if [ $? -ne 0 ]; then
+                echo "Unable to create changelog for ${ddir}-$dver/$p.spec"
                 exit -1
             fi
 
-            echo "Using $log customization to build changelog file"
             ddate=`LANG=C ; date "+%a %b %d %Y"`
             cat > $dest/distributions/${ddir}-$dver/$p.changelog.new << EOF
@@ -91 +86 @@
 
 EOF
-            cat $log >> $dest/distributions/${ddir}-$dver/$p.changelog.new
-            m4 /tmp/mondorescue.mc $dest/distributions/${ddir}-$dver/$p.changelog.new >> $dest/distributions/${ddir}-${dver}/$p.spec
-            rm -f $dest/distributions/${ddir}-$dver/$p.changelog.new
-
         elif [ "$dtype" = "ebuild" ]; then
             m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v-r$TAG.ebuild