Changeset 315 in MondoRescue

Timestamp:

Jan 13, 2006, 8:07:06 PM (18 years ago)

Author:

bcornec

Message:

• svn.log now part of the rpms
• .spec factorisation continues (mkrel, requires, ...)

Location:

branches/2.06

Files:

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

branches/2.06/mindi/install.sh

@@ -61 +61 @@
 
 install -m 644 mindi.8 $MANDIR
-install -m 644 ChangeLog COPYING README README.busybox README.ia64 README.pxe TODO INSTALL $DOCDIR
+install -m 644 ChangeLog COPYING README README.busybox README.ia64 README.pxe TODO INSTALL svn.log $DOCDIR
 
 # Managing busybox

branches/2.06/mindi/mindi.spec

@@ -11 +11 @@
 %define version VVV
 %define mrel    RRR
+%define release %{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
@@ -24 +28 @@
 %define src     %{name}-%{version}.tar.bz2
 %define addreq  %{addreqb}, which
+%define release %{mkrel} %{mrel}
 Autoreqprov: no
 %endif
@@ -30 +35 @@
 %define src     %{name}-%{version}.tar.bz2
 %define addreq  %{addreqb}, which
+%define release %{mkrel} %{mrel}
 Autoreqprov: no
 %endif
@@ -40 +46 @@
 Name:       %name
 Version:    %version
-Release:    %mrel
+Release:    %release
 License:    GPL
 Group:      %{grp}
@@ -96 +102 @@
 %defattr(644,root,root,755)
 %config(noreplace) %{_sysconfdir}/mindi/deplist.txt
-%doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox
+%doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox svn.log
 %{_mandir}
 %{_libdir}/mindi

branches/2.06/mondo/mondo.spec

@@ -13 +13 @@
 %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
-%define src     Applications/Archiving
+%define grp     Applications/Archiving
+%define addreq  %{addreqb}
 Autoreq:        0
 %endif
@@ -21 +26 @@
 %if %is_mandrake
 %define src     %{name}-%{version}.tar.bz2
+%define addreq  %{addreqb}
 Autoreqprov:    no
 %endif
@@ -26 +32 @@
 %if %is_mandriva
 %define src     %{name}-%{version}.tar.bz2
+%define addreq  %{addreqb}
 Autoreqprov:    no
 %endif
 
 %if %is_suse
+%define addreq  %{addreqb}
 %endif
 
@@ -47 +55 @@
 BuildRequires:  newt-devel >= 0.50, slang-devel >= 1.4.1, gcc
 %ifarch ia64
-Requires:   mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, elilo, newt >= 0.50, slang >= 1.4.1, buffer, parted
+Requires:   %{addreq}, elilo, parted
 %else
-Requires:   mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, syslinux >= 1.52, newt >= 0.50, slang >= 1.4.1, buffer
+Requires:   %{addreq}, syslinux >= 1.52
 %endif
 
@@ -124 +132 @@
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog mondo/docs/en/1.6x-howto/*
+%doc ChangeLog svn.log mondo/docs/en/1.6x-howto/*
 %doc INSTALL COPYING README TODO AUTHORS NEWS
 

branches/2.06/tools/mkrpm

@@ -20 +20 @@
 cd $TOOLHOME/..
 rev=`$TOOLHOME/mksvnversion`
+
+echo "Generating SVN log file ..."
 svn log -v > /tmp/mondorescue-svn.log
 

branches/2.06/tools/rpm-env

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