Changeset 317 in MondoRescue for trunk/mindi

Timestamp:

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

Author:

bcornec

Message:

merge -r309:316 $SVN_M/branches/2.06

Location:

trunk/mindi

Files:

• install.sh (modified) (2 diffs)
• mindi (modified) (3 diffs)
• mindi.spec (modified) (5 diffs)

trunk/mindi/install.sh

@@ -47 +47 @@
 install -m 644 deplist.txt $conf
 
-cp -af rootfs aux-tools Mindi $locallib/mindi
+cp -af rootfs aux-tools $locallib/mindi
 chmod 755 $locallib/mindi/rootfs/bin/*
 chmod 755 $locallib/mindi/rootfs/sbin/*
@@ -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

trunk/mindi/mindi

@@ -13 +13 @@
 #-----------------------------------------------------------------------------
 
+### Which arch are we on (useful for ia64 port)
+export ARCH=`/bin/arch`
 
 ADDITIONAL_BOOT_PARAMS="acpi=off apm=off devfs=nomount exec-shield=0"
@@ -33 +35 @@
 MINDI_CONF=YYY
 MINDI_SBIN=${MINDI_PREFIX}/sbin
-MINDI_LIB=${MINDI_PREFIX}/lib/mindi
+
+
+if [ "$ARCH" = "x86_64" ] ; then
+    MINDI_LIB=${MINDI_PREFIX}/lib64/mindi
+else
+    MINDI_LIB=${MINDI_PREFIX}/lib/mindi
+fi
 
 EXTRA_SPACE=24576         ; # increase if you run out of ramdisk space
@@ -2908 +2916 @@
 > $LOGFILE
 echo "mindi v$MINDI_VERSION" >> $LOGFILE
-### BCO
-### Which arch are we on (useful for ia64 port)
-export ARCH=`/bin/arch`
 echo "$ARCH architecture detected" >> $LOGFILE
 echo "mindi called with the following arguments:" >> $LOGFILE

trunk/mindi/mindi.spec

@@ -10 +10 @@
 %define name    mindi
 %define version VVV
-%define mrel    1
+%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 bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools, afio
 
 %if %is_redhat
-Group:          Applications/Archiving
+%define grp     Applications/Archiving
+%define addreq  %{addreqb}, which
 Autoreq:    0
 %endif
@@ -20 +25 @@
 %if %is_mandrake
 %define src     %{name}-%{version}.tar.bz2
-Group:          Archiving/Backup
+%define addreq  %{addreqb}, which
 Autoreqprov: no
 %endif
@@ -26 +31 @@
 %if %is_mandriva
 %define src     %{name}-%{version}.tar.bz2
-Group:          Archiving/Backup
+%define addreq  %{addreqb}, which
 Autoreqprov: no
 %endif
 
 %if %is_suse
-Group:          Archiving/Backup
+%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
 
@@ -37 +47 @@
 Name:       %name
 Version:    %version
-Release:    %mrel
+Release:    %rel
 License:    GPL
-Group:      System/Kernel and hardware
+Group:      %{grp}
 Url:        http://mondorescue.berlios.de
 Source:     %{src}
 BuildRoot:  %{_tmppath}/%{name}-%{version}
-Requires:   bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools, afio, which
+Requires:   %{addreq}
 # Not on all systems
 #Conflicts: bonnie++
@@ -93 +103 @@
 %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