Changeset 316


Ignore:
Timestamp:
Jan 13, 2006, 8:44:05 PM (13 years ago)
Author:
bcornec
Message:

Preparation to support official mandriva builds

Location:
branches/2.06
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.06/mindi/mindi.spec

    r315 r316  
    1111%define version VVV
    1212%define mrel    RRR
    13 %define release %{mrel}
     13# if mandriva official build (rpm --with is_official)
     14%{?is_official:%define rel %{mkrel} %{mrel}}%{!?is_official:%define rel %{mrel}}
    1415%define src     %{name}-%{version}.tgz
    1516%define grp     Archiving/Backup
    1617%define addreqb bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools, afio
    17 
    18 # define the mkrel macro if it is not already defined
    19 %{?!mkrel:%define mkrel(c:) %{-c:0.%{-c*}.}%{!?_with_unstable:%(perl -e '$_="%{1}";m/(.\*)(\\d+)$/;$rel=${2}-1;re;print "$1$rel";').%{?subrel:%subrel}%{!?subrel:1}.%{?distversion:%distversion}%{?!distversion:%(echo $[%{mdkversion}/10])}}%{?_with_unstable:%{1}}%{?distsuffix:%distsuffix}%{?!distsuffix:mdk}}
    2018
    2119%if %is_redhat
     
    2826%define src     %{name}-%{version}.tar.bz2
    2927%define addreq  %{addreqb}, which
    30 %define release %{mkrel} %{mrel}
    3128Autoreqprov: no
    3229%endif
     
    3532%define src     %{name}-%{version}.tar.bz2
    3633%define addreq  %{addreqb}, which
    37 %define release %{mkrel} %{mrel}
    3834Autoreqprov: no
    3935%endif
     
    4137%if %is_suse
    4238%define addreq  %{addreqb}
     39%endif
     40
     41# define the mkrel macro if it is not already defined if mandriva offical build
     42%if is_official
     43%{?!mkrel:%define mkrel(c:) %{-c:0.%{-c*}.}%{!?_with_unstable:%(perl -e '$_="%{1}";m/(.\*)(\\d+)$/;$rel=${2}-1;re;print "$1$rel";').%{?subrel:%subrel}%{!?subrel:1}.%{?distversion:%distversion}%{?!distversion:%(echo $[%{mdkversion}/10])}}%{?_with_unstable:%{1}}%{?distsuffix:%distsuffix}%{?!distsuffix:mdk}}
    4344%endif
    4445
     
    4647Name:       %name
    4748Version:    %version
    48 Release:    %release
     49Release:    %rel
    4950License:    GPL
    5051Group:      %{grp}
  • branches/2.06/mondo/mondo.spec

    r315 r316  
    1111%define version VVV
    1212%define mrel    RRR
     13# if mandriva official build (rpm --with is_official)
     14%{?is_official:%define rel %{mkrel} %{mrel}}%{!?is_official:%define rel %{mrel}}
    1315%define src     %{name}-%{version}.tgz
    1416%define grp     Archiving/Backup
    1517%define addreqb mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1
    16 
    17 # define the mkrel macro if it is not already defined
    18 %{?!mkrel:%define mkrel(c:) %{-c:0.%{-c*}.}%{!?_with_unstable:%(perl -e '$_="%{1}";m/(.\*)(\\d+)$/;$rel=${2}-1;re;print "$1$rel";').%{?subrel:%subrel}%{!?subrel:1}.%{?distversion:%distversion}%{?!distversion:%(echo $[%{mdkversion}/10])}}%{?_with_unstable:%{1}}%{?distsuffix:%distsuffix}%{?!distsuffix:mdk}}
    1918
    2019%if %is_redhat
  • branches/2.06/tools/rpm-env

    r315 r316  
    3737    export ddir="mandriva"
    3838    export dver=`awk '{print $4}' /etc/mandriva-release`
    39     export suf=" "
     39    export suf=".`echo $dver | sed 's/\.//'`mdk"
    4040elif [ -e /etc/mandrake-release ]; then
    4141    export ddir="mandrake"
    4242    export dver=`awk '{print $3}' /etc/mandrake-release`
    43     export suf=" "
     43    export suf=".`echo $dver | sed 's/\.//'`mdk"
    4444elif [ -e /etc/redhat-release ]; then
    4545    grep -q Enterprise /etc/redhat-release
Note: See TracChangeset for help on using the changeset viewer.