Changeset 77 in MondoRescue for trunk

Timestamp:

Oct 20, 2005, 2:44:09 PM (20 years ago)

Author:

bcornec

Message:

merge r71:76 of the branch 2.04_berlios

Location:

trunk

Files:

• mindi/mindi.spec (modified) (2 diffs)
• tools/mkdeliv (modified) (1 diff)

trunk/mindi/mindi.spec

@@ -66 +66 @@
 
 %{__mkdir_p} $MINDIDIR $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_sysconfdir}/mindi $RPM_BUILD_ROOT%{_sbindir}
-%{__mv} deplist.txt $RPM_BUILD_ROOT%{_sysconfdir}/mindi/
+%{__cp} deplist.txt $RPM_BUILD_ROOT%{_sysconfdir}/mindi/
 %{__cp} -af * $MINDIDIR
 
@@ -90 +90 @@
 
 cd $RPM_BUILD_ROOT%{_sbindir}
-%{__ln_s} -f ${_sbindir}/mindi/mindi .
-%{__ln_s} -f ${_sbindir}/mindi/analyze-my-lvm .
-%ifarch ia64
-%{__ln_s} -f ${_sbindir}/mindi/parted2fdisk.pl .
+%{__ln_s} -f %{_datadir}/mindi/mindi .
+%{__ln_s} -f %{_datadir}/mindi/analyze-my-lvm .
+%ifarch ia64
+%{__ln_s} -f %{_datadir}/mindi/parted2fdisk.pl .
 %endif
 

trunk/tools/mkdeliv

@@ -40 +40 @@
     srpms="$srpms ${TOPDIR}/SRPMS/mondo-${MONDO_VER}-${rev}.${suf}.src.rpm"
 fi
+echo "Sources delivery to ${SVNAUTH}:${DSTDIR}/src"
 scp -p ${tgz} ${SVNAUTH}:${DSTDIR}/src
 ssh ${SVNAUTH} "mkdir -p ${DSTDIR}/${ddir}/${dver}"
+echo "Packages delivery to {SVNAUTH}:${DSTDIR}/${ddir}/${dver}"
 scp -p ${rpms} ${SVNAUTH}:${DSTDIR}/${ddir}/${dver}
 scp -p ${srpms} ${SVNAUTH}:${DSTDIR}/${ddir}/${dver}
+echo "Sources delivery to {FTPURL}"
 ncftpput ${FTPURL} ${tgz}