Changeset 316 in MondoRescue for branches

Timestamp:

Jan 13, 2006, 8:44:05 PM (18 years ago)

Author:

bcornec

Message:

Preparation to support official mandriva builds

Location:

branches/2.06

Files:

• mindi/mindi.spec (modified) (5 diffs)
• mondo/mondo.spec (modified) (1 diff)
• tools/rpm-env (modified) (1 diff)

branches/2.06/mindi/mindi.spec

@@ -11 +11 @@
 %define version VVV
 %define mrel    RRR
-%define release %{mrel}
+# if mandriva official build (rpm --with is_official)
+%{?is_official:%define rel %{mkrel} %{mrel}}%{!?is_official:%define rel %{mrel}}
 %define src     %{name}-%{version}.tgz
 %define grp     Archiving/Backup
 %define addreqb bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools, afio
-
-# define the mkrel macro if it is not already defined
-%{?!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}}
 
 %if %is_redhat
@@ -28 +26 @@
 %define src     %{name}-%{version}.tar.bz2
 %define addreq  %{addreqb}, which
-%define release %{mkrel} %{mrel}
 Autoreqprov: no
 %endif
@@ -35 +32 @@
 %define src     %{name}-%{version}.tar.bz2
 %define addreq  %{addreqb}, which
-%define release %{mkrel} %{mrel}
 Autoreqprov: no
 %endif
@@ -41 +37 @@
 %if %is_suse
 %define addreq  %{addreqb}
+%endif
+
+# define the mkrel macro if it is not already defined if mandriva offical build
+%if is_official
+%{?!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}}
 %endif
 
@@ -46 +47 @@
 Name:       %name
 Version:    %version
-Release:    %release
+Release:    %rel
 License:    GPL
 Group:      %{grp}

branches/2.06/mondo/mondo.spec

@@ -11 +11 @@
 %define version VVV
 %define mrel    RRR
+# if mandriva official build (rpm --with is_official)
+%{?is_official:%define rel %{mkrel} %{mrel}}%{!?is_official:%define rel %{mrel}}
 %define src     %{name}-%{version}.tgz
 %define grp     Archiving/Backup
 %define addreqb mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1
-
-# define the mkrel macro if it is not already defined
-%{?!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}}
 
 %if %is_redhat

branches/2.06/tools/rpm-env

@@ -37 +37 @@
     export ddir="mandriva"
     export dver=`awk '{print $4}' /etc/mandriva-release`
-    export suf=" "
+    export suf=".`echo $dver | sed 's/\.//'`mdk"
 elif [ -e /etc/mandrake-release ]; then
     export ddir="mandrake"
     export dver=`awk '{print $3}' /etc/mandrake-release`
-    export suf=" "
+    export suf=".`echo $dver | sed 's/\.//'`mdk"
 elif [ -e /etc/redhat-release ]; then
     grep -q Enterprise /etc/redhat-release