Changeset 642 in MondoRescue

Timestamp:

Jun 7, 2006, 10:50:06 PM (18 years ago)

Author:

bcornec

Message:

Changelog generation bug fix

Location:

branches/2.0.8/tools

Files:

• mkchangelog.pl (modified) (1 diff)
• svn2build (modified) (1 diff)

branches/2.0.8/tools/mkchangelog.pl

@@ -59 +59 @@
     chomp($date);
     $date =~ s/\(([0-9-]+)\)/$1/;
-    print "**$date**\n";
+    #print "**$date**\n";
     $ndate = UnixDate($date,"%a", "%b", "%d", "%Y");
-    print "**$ndate**\n";
+    #print "**$ndate**\n";
     if ($dtype eq "rpm") {
         printf OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> $ver\n";

branches/2.0.8/tools/svn2build

@@ -74 +74 @@
             m4 /tmp/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
 
-            $TOOLHOME/mkchangelog.pl $dtype $p $dest/distributions/${ddir}-$dver/$p.spec
+            $TOOLHOME/mkchangelog.pl $dtype $p /tmp/$p.spec
             if [ $? -ne 0 ]; then
                 echo "Unable to create changelog for ${ddir}-$dver/$p.spec"
                 exit -1
             fi
-
-            ddate=`LANG=C ; date "+%a %b %d %Y"`
-            cat > $dest/distributions/${ddir}-$dver/$p.changelog.new << EOF
-* $ddate Bruno Cornec <bruno@mondorescue.org> VVV-RRR
-- Updated to VVV-r${REVISION}
-
-EOF
+            cat /tmp/$p.spec >> $dest/distributions/${ddir}-$dver/$p.spec
+            rm -f /tmp/$p.spec
         elif [ "$dtype" = "ebuild" ]; then
             m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v-r$TAG.ebuild