Changeset 51 in MondoRescue for trunk/tools/rpm-env

Timestamp:

Oct 8, 2005, 12:50:41 AM (19 years ago)

Author:

bcornec

Message:

Merge patches from branch 2.04_berlios (r46-r50)

File:

• trunk/tools/rpm-env (modified) (2 diffs)

trunk/tools/rpm-env

@@ -22 +22 @@
 mkdir -p ${TMP}
 if [ -f ${HOME}/.rpmmacros ]; then
-    export TOPDIR=`grep _topdir ${HOME}/.rpmmacros | awk '{print $2}'`
+    export TOPDIR=`egrep '^%_topdir' ${HOME}/.rpmmacros | awk '{print $2}'`
 else
     export TOPDIR=${BASE}/RPMS
@@ -29 +29 @@
 mkdir -p RPMS SRPMS SPECS SOURCES BUILD
 
-export MINDI_VER=`cat ${BASE}/svn/${VER}/mindi/mindi.spec | egrep '^Version:' | cut -d: -f2 | sed "s/[  ]*//"`
-export MONDO_VER=`cat ${BASE}/svn/${VER}/mondo/mondo.spec | egrep '^Version:' | cut -d: -f2 | sed "s/[  ]*//"`
+export MINDI_VER=`cat ${BASE}/svn/${VER}/mindi/mindi.spec | egrep '^%define version' | awk '{print $3}' | sed "s/[  ]*//"`
+export MONDO_VER=`cat ${BASE}/svn/${VER}/mondo/mondo.spec | egrep '^%define version' | awk '{print $3}' | sed "s/[  ]*//"`