Changeset 394 in MondoRescue for trunk/tools/mkrpm

Timestamp:

Feb 15, 2006, 11:44:31 AM (18 years ago)

Author:

bcornec

Message:

merge -r387:391 $SVN_M/branches/stable

File:

• trunk/tools/mkrpm (modified) (2 diffs)

trunk/tools/mkrpm

@@ -28 +28 @@
     cd ${BASE}/svn
     mkdir -p ${TOPDIR}/SOURCES 
-    sed "s/^%define mrel..*RRR/%define mrel ${REVISION}${suf}/" mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
+    $TOOLHOME/mkspec ${MINDI_VER} mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
 fi
 if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
     cd ${BASE}/svn
-    if [ -f mindi-${MINDI_VER}/distributions/${ddir}/mindi.spec ]; then
-        specfile=mindi-${MINDI_VER}/distributions/${ddir}/mindi.spec
-    else
-        specfile=mindi-${MINDI_VER}/distributions/common/mindi.spec
-    fi
-    sed -e "s/^%define mrel..*RRR/%define mrel  ${REVISION}${suf}/" -e "s/VVV/${MINDI_VER}/" $specfile > ${TOPDIR}/SPECS/mindi.spec
+    $TOOLHOME/mkspec ${MINDI_VER} mindi-${MINDI_VER}/distributions/rpm/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
     rm -rf mindi-${MINDI_VER}/distributions
     mkdir -p ${TOPDIR}/SOURCES 
@@ -48 +43 @@
 if [ "`echo $c | grep  mondo`" != "" ]; then
     cd ${BASE}/svn
-    if [ -f mondo-${MONDO_VER}/distributions/${ddir}/mondo.spec ]; then
-        specfile=mondo-${MONDO_VER}/distributions/${ddir}/mondo.spec
-    else
-        specfile=mondo-${MONDO_VER}/distributions/common/mondo.spec
-    fi
-    sed -e "s/^%define mrel..*RRR/%define mrel  ${REVISION}${suf}/" -e "s/VVV/${MONDO_VER}/" $specfile > ${TOPDIR}/SPECS/mondo.spec
+    $TOOLHOME/mkspec ${MONDO_VER} mondo-${MONDO_VER}/distributions/rpm/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
     rm -rf mondo-${MONDO_VER}/distributions