Changeset 729 in MondoRescue for trunk/tools/svn2build

Timestamp:

Jul 30, 2006, 4:06:39 PM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r686:728 $SVN_M/branches/stable

File:

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

trunk/tools/svn2build

@@ -37 +37 @@
     v=`cat ${SVNBRANCH}/$p/VERSION`
     echo "Management of $p $v-$REVISION"
-    dest="$p-$v-$TAG"
+    dest="$p-$v"
     rm -fr $dest
     svn export ${SVNBRANCH}/$p $dest
@@ -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
@@ -116 +116 @@
     if [ _"`echo $p | grep -v kernel | grep mindi`" != _"" ]; then
         v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
-        if [ ! -d mondo-doc-$v1-$TAG ]; then
+        if [ ! -d mondo-doc-$v1 ]; then
             echo "mondo-doc should be created before $p"
             exit -1
         fi
-        (cd mondo-doc-$v1-$TAG ; make -f Makefile.man install-$p INSTALLDIR=../$dest)
+        (cd mondo-doc-$v1 ; make -f Makefile.man install-$p INSTALLDIR=../$dest)
         rm -f $dest/rootfs/sbin/parted2fdisk-ia64 
     fi
     if [ "`echo $p | grep -v doc | grep  mondo`" != "" ]; then
         v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
-        if [ ! -d mondo-doc-$v1-$TAG ]; then
+        if [ ! -d mondo-doc-$v1 ]; then
             echo "mondo-doc should be created before $p"
             exit -1
         fi
-        (cd mondo-doc-$v1-$TAG ; make -f Makefile.howto install INSTALLDIR=../$dest/docs/en ; make -f Makefile.man install-$p INSTALLDIR=../$dest/docs/man)
+        (cd mondo-doc-$v1 ; make -f Makefile.howto install INSTALLDIR=../$dest/docs/en ; make -f Makefile.man install-$p INSTALLDIR=../$dest/docs/man)
         (cd $dest ; echo "Bootstraping mondo ... " ; ./bootstrap)
     fi