Changeset 495 in MondoRescue for branches

Timestamp:

Apr 20, 2006, 10:23:15 AM (18 years ago)

Author:

bcornec

Message:

merge -r 493:494 $SVN_M/branches/stable
(fedora support improved)

Location:

branches/2.0.7/mindi

Files:

• distributions/redhat/changelog (copied) (copied from branches/stable/mindi/distributions/redhat/changelog )
• distributions/redhat/spec.m4 (modified) (1 diff)
• distributions/rpm/mindi.spec (modified) (4 diffs)
• distributions/suse/changelog (copied) (copied from branches/stable/mindi/distributions/suse/changelog )
• mindi (modified) (1 diff)

branches/2.0.7/mindi/distributions/redhat/spec.m4

@@ -2 +2 @@
 dnl
 dnl SSS is replaced by the source package format
-define(`SSS', %{name}-%{version}.tgz)dnl
+define(`SSS', ftp://ftp.mondorescue.org/src/%{name}-%{version}.tgz)dnl
 dnl DDD is replaced by the list of dependencies specific to that distro
 define(`DDD', %{addreqb}, which, grep >= 2.5)dnl
 dnl GRP is replaced by the RPM group of apps
-define(`GRP', Archiving/Archiving)dnl
+define(`GRP', Applications/Archiving)dnl

branches/2.0.7/mindi/distributions/rpm/mindi.spec

@@ -17 +17 @@
 License:    GPL
 Group:      %{grp}
-Url:        http://mondorescue.berlios.de
+Url:        http://www.mondorescue.org
 Source:     %{src}
-BuildRoot:  %{_tmppath}/%{name}-%{version}
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 Requires:   %{addreq}
 Epoch:      %(echo EEE | cut -d- -f1 | sed "s~M~~")
@@ -32 +32 @@
 
 %prep
-%{__rm}  -rf $RPM_BUILD_ROOT
 %setup -n %name-%{version}
 
@@ -42 +41 @@
 
 %install
+%{__rm}  -rf $RPM_BUILD_ROOT
 export DONT_RELINK=1
 
-%{__rm} -rf $RPM_BUILD_ROOT
 export PREFIX=${RPM_BUILD_ROOT}%{_exec_prefix}
 export CONFDIR=${RPM_BUILD_ROOT}%{_sysconfdir}
@@ -61 +60 @@
 %files
 %defattr(644,root,root,755)
-%config(noreplace) %{_sysconfdir}/mindi/deplist.txt
+%config(noreplace) %{_sysconfdir}/mindi
+%config(noreplace) %{_sysconfdir}/mindi/deplist.txt 
 %doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox svn.log
 %{_mandir}/man8/*

branches/2.0.7/mindi/mindi

@@ -1254 +1254 @@
     if [ $tmpmodprobe_flag == "Y" ] ; then
         infile="/tmp/modprobe.conf.mindi.$$"
-        find /etc/modprobe.d -maxdepth 1 -name "*" -xtype f | xargs cat > $infile
+        find /etc/modprobe.d -maxdepth 1 -name "*" -xtype f -print0 | xargs -0 cat > $infile
     else
         infile="/etc/modules.conf"