Changeset 313 in MondoRescue for branches/2.06/tools


Ignore:
Timestamp:
Jan 13, 2006, 7:31:32 PM (19 years ago)
Author:
bcornec
Message:

spec file generation adapted (RRR used for revision, suffix now has the '.', Group is now a variable)

Location:
branches/2.06/tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.06/tools/mkrpm

    r311 r313  
    3838    tar cvfhz ${TOPDIR}/SOURCES/mindi-kernel-${MINDI_VER}.tgz mindi-kernel-${MINDI_VER}
    3939    tar cvfhj ${TOPDIR}/SOURCES/mindi-kernel-${MINDI_VER}.tar.bz2 mindi-kernel-${MINDI_VER}
    40     sed "s/^%define mrel..*/%define mrel    ${rev}.${suf}/" mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
     40    sed "s/^%define mrel..*RRR/%define mrel ${rev}${suf}/" mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
    4141    rm -f ${TMP}/mindi-kernel*-root
    42     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${rev}.${suf}.${ARCH}.rpm"
     42    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${rev}${suf}.${ARCH}.rpm"
    4343fi
    4444if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
     
    5555    tar cvfhz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz mindi-${MINDI_VER}
    5656    tar cvfhj ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tar.bz2 mindi-${MINDI_VER}
    57     sed -e "s/^%define mrel..*/%define mrel ${rev}.${suf}/" -e "s/VVV/${MINDI_VER}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
     57    sed -e "s/^%define mrel..*RRR/%define mrel  ${rev}${suf}/" -e "s/VVV/${MINDI_VER}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
    5858    rm -f ${TMP}/mindi-*-root
    59     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}.${suf}.${ARCH}.rpm"
     59    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}${suf}.${ARCH}.rpm"
    6060    # ATTENTION: This could be dangerous for your setup
    6161    opt="rm -rf /usr/lib/mindi ;"
     
    7676    tar cvfhz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz mondo-${MONDO_VER}
    7777    tar cvfhj ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 mondo-${MONDO_VER}
    78     sed -e "s/^%define mrel..*/%define mrel ${rev}.${suf}/" -e "s/VVV/${MONDO_VER}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
     78    sed -e "s/^%define mrel..*RRR/%define mrel  ${rev}${suf}/" -e "s/VVV/${MONDO_VER}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
    7979    rm -f ${TMP}/mondo-*-root
    80     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}.${suf}.${ARCH}.rpm"
     80    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}${suf}.${ARCH}.rpm"
    8181fi
    8282cd ${TOPDIR}/SPECS
  • branches/2.06/tools/rpm-env

    r275 r313  
    3737    export ddir="mandriva"
    3838    export dver=`awk '{print $4}' /etc/mandriva-release`
    39     export suf="${dver}mdk"
     39    export suf=".${dver}mdk"
    4040elif [ -e /etc/mandrake-release ]; then
    4141    export ddir="mandrake"
    4242    export dver=`awk '{print $3}' /etc/mandrake-release`
    43     export suf="${dver}mdk"
     43    export suf=".${dver}mdk"
    4444elif [ -e /etc/redhat-release ]; then
    4545    grep -q Enterprise /etc/redhat-release
     
    5050        export ddir="fedora"
    5151        export dver=`awk '{print $4}' /etc/redhat-release`
    52         export suf="fc${dver}"
     52        export suf=".fc${dver}"
    5353    else
    5454        export ddir="redhat"
    5555        export dver=`awk '{print $5}' /etc/redhat-release | sed "s/\.//"`
    56         export suf="rh${dver}"
     56        export suf=".rh${dver}"
    5757    fi
    5858elif [ -e /etc/SuSE-release ]; then
     
    7171
    7272if [ _"$suf" = _"" ]; then
    73     export suf="${ddir}${dver}"
     73    export suf=".${ddir}${dver}"
    7474fi
Note: See TracChangeset for help on using the changeset viewer.