Changeset 51 in MondoRescue for trunk/tools

Timestamp:

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

Author:

bcornec

Message:

Merge patches from branch 2.04_berlios (r46-r50)

Location:

trunk/tools

Files:

• mkdeliv (modified) (2 diffs)
• mkrpm (modified) (2 diffs)
• rpm-env (modified) (2 diffs)

trunk/tools/mkdeliv

@@ -28 +28 @@
 if [ "`echo $c | grep mindi`" != "" ]; then
     cp -a ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tgz
-    tgz="$tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tgz"
+    tgz="$tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tar.bz2"
     rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}.${ARCH}.rpm"
     srpms="$srpms ${TOPDIR}/SRPMS/mindi-${MINDI_VER}-${rev}.src.rpm"
@@ -34 +34 @@
 if [ "`echo $c | grep  mondo`" != "" ]; then
     cp -a ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tgz
-    tgz="$tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tgz"
+    tgz="$tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tar.bz2"
     rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}.${ARCH}.rpm"
     srpms="$srpms ${TOPDIR}/SRPMS/mondo-${MONDO_VER}-${rev}.src.rpm"

trunk/tools/mkrpm

@@ -34 +34 @@
     mkdir -p ${TOPDIR}/SOURCES 
     tar cvfhz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz mindi-${MINDI_VER}
-    sed "s/^Release:..*/Release:    ${rev}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
+    tar cvfhj ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tar.bz2 mindi-${MINDI_VER}
+    sed "s/^%define mrel..*/%define mrel    ${rev}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
     rm -f ${TMP}/mindi-*-root
     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}.${ARCH}.rpm"
@@ -53 +54 @@
     cd ..
     tar cvfhz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz mondo-${MONDO_VER}
-    sed "s/^Release:..*/Release:    ${rev}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
+    tar cvfhj ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 mondo-${MONDO_VER}
+    sed "s/^%define mrel..*/%define mrel    ${rev}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
     rm -f ${TMP}/mondo-*-root
     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}.${ARCH}.rpm"

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/[  ]*//"`