Changeset 426 in MondoRescue for trunk/tools/mkrpm

Timestamp:

Feb 23, 2006, 4:09:24 PM (18 years ago)

Author:

bcornec

Message:

merge -r421:425 $SVN_M/branches/stable

File:

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

trunk/tools/mkrpm

@@ -29 +29 @@
     mkdir -p ${TOPDIR}/SOURCES 
     $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"
+    chmod 644 ${TOPDIR}/SPECS/mindi-kernel.spec
+    pkg1="${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
+    pkg="$pkg $pkg1"
+    rm -f $pkg1
 fi
 if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
     cd ${BASE}/svn
     $TOOLHOME/mkspec ${MINDI_VER} mindi-${MINDI_VER}/distributions/rpm/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
+    cat mindi-${MINDI_VER}/distributions/$dfam/changelog >> ${TOPDIR}/SPECS/mindi.spec
+    chmod 644 ${TOPDIR}/SPECS/mindi.spec
     rm -rf mindi-${MINDI_VER}/distributions
     mkdir -p ${TOPDIR}/SOURCES 
 
-    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
+    pkg1="${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
+    pkg="$pkg $pkg1"
+    rm -f $pkg1
     # ATTENTION: This could be dangerous for your setup
     opt="rm -rf /usr/lib/mindi ;"
@@ -44 +51 @@
     cd ${BASE}/svn
     $TOOLHOME/mkspec ${MONDO_VER} mondo-${MONDO_VER}/distributions/rpm/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
+    cat mondo-${MONDO_VER}/distributions/$dfam/changelog >> ${TOPDIR}/SPECS/mondo.spec
+    chmod 644 ${TOPDIR}/SPECS/mondo.spec
     rm -rf mondo-${MONDO_VER}/distributions
 
-    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${REVISION}${suf}.${ARCH}.rpm"
+    pkg1="${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${REVISION}${suf}.${ARCH}.rpm"
+    pkg="$pkg $pkg1"
+    rm -f $pkg1
 fi