Changeset 542 in MondoRescue for branches/stable/tools

Timestamp:

May 13, 2006, 8:48:41 PM (19 years ago)

Author:

bcornec

Message:

merge -r436:517 $SVN_M/branches/2.0.7
stable is now again at 2.0.8 initial

Location:

branches/stable/tools

Files:

• mkdeliv (modified) (1 diff)
• mkspec (modified) (2 diffs)
• rpm-env (modified) (1 diff)

branches/stable/tools/mkdeliv

@@ -8 +8 @@
 # BerliOS FTP/SSH setup
 ACCOUNT=bruno@ftp.mondorescue.org
-DSTDIR=/
+DSTDIR=/mondo/ftp
 FTPSERV="ftp.berlios.de"
 FTPDIR="/incoming"

branches/stable/tools/mkspec

@@ -12 +12 @@
 if [ -f ${dir}/../$ddir/spec.m4 ]; then 
     inc=${dir}/../$ddir/spec.m4
-elif [ -f ${dir}/../$ddmir/spec.m4 ]; then 
-    inc=${dir}/../$ddmir/spec.m4
+elif [ -f ${dir}/../$dfam/spec.m4 ]; then 
+    inc=${dir}/../$dfam/spec.m4
 else
     echo "Unable to build RPM for this distro. Please report to authors"
@@ -25 +25 @@
 cat >> /tmp/mondorescue.mc << EOF
 define(\`RRR', ${REVISION}${suf})dnl
+define(\`EEE', ${REVISION})dnl
 define(\`VVV', ${1})dnl
 EOF

branches/stable/tools/rpm-env

@@ -56 +56 @@
         export ddir="redhat"
         dver=`awk '{print $5}' /etc/redhat-release`
+        export dver=`echo ${dver} | sed "s/\.//"`
         export suf=".rh${dver}"
-        export dver=`echo ${dver} | sed "s/\.//"`
     fi
 elif [ -e /etc/SuSE-release ]; then