Changeset 710 in MondoRescue for branches

Timestamp:

Jul 23, 2006, 6:48:00 PM (18 years ago)

Author:

bcornec

Message:

Try to fix autorun issue
Try to fix version name in changelogs

Location:

branches/stable

Files:

• mondo/mondo/Makefile.am (modified) (1 diff)
• tools/mkchangelog.pl (modified) (1 diff)
• tools/svn2build (modified) (2 diffs)

branches/stable/mondo/mondo/Makefile.am

@@ -2 +2 @@
 DIST_SUBDIRS   = ${SUBDIRS}
 
-pkgdata_DATA   = do-not-compress-these
-pkgdata_PROGRAMS   = autorun
+pkgdata_DATA   = do-not-compress-these autorun
+
+all:    all-am chmod
+
+chmod:  ${DESTDIR}/${datadir}/autorun
+    chmod 755 ${DESTDIR}/${datadir}/autorun

branches/stable/tools/mkchangelog.pl

@@ -83 +83 @@
     #print "**$ndate**\n";
     if ($dtype eq "rpm") {
-        print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> $ver\n";
+        print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> VVV-RRR\n";
         print OUTPUT "- Updated to $ver\n";
         }

branches/stable/tools/svn2build

@@ -72 +72 @@
             fi
             echo "Using $inc customization to build SPEC file"
-            m4 $TMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
 
             $TOOLHOME/mkchangelog.pl $dtype $p $TMP/$p.spec
@@ -79 +78 @@
                 exit -1
             fi
-            cat $TMP/$p.spec >> $dest/distributions/${ddir}-$dver/$p.spec
+            m4 $TMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec $TMP/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
+
             rm -f $TMP/$p.spec
         elif [ "$dtype" = "ebuild" ]; then