Changeset 496 for trunk


Ignore:
Timestamp:
Apr 22, 2006, 1:10:04 AM (13 years ago)
Author:
bcornec
Message:

merge -r 489:495 $SVN_M/branches/stable

Location:
trunk
Files:
4 edited
2 copied

Legend:

Unmodified
Added
Removed
  • trunk/documentation/mondoarchive.8

    r408 r496  
    369369Backup PC using DVD Media:
    370370.br
    371 .I "mondoarchive -OVr 2 -d /dev/scd0 -gF -s 4200m"
     371.I "mondoarchive -OVr -d /dev/scd0 -gF -s 4200m"
    372372
    373373.BI TAPE:
  • trunk/mindi/distributions/redhat/spec.m4

    r388 r496  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', %{name}-%{version}.tgz)dnl
     4define(`SSS', ftp://ftp.mondorescue.org/src/%{name}-%{version}.tgz)dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', %{addreqb}, which, grep >= 2.5)dnl
    77dnl GRP is replaced by the RPM group of apps
    8 define(`GRP', Archiving/Archiving)dnl
     8define(`GRP', Applications/Archiving)dnl
  • trunk/mindi/distributions/rpm/mindi.spec

    r461 r496  
    1717License:    GPL
    1818Group:      %{grp}
    19 Url:        http://mondorescue.berlios.de
     19Url:        http://www.mondorescue.org
    2020Source:     %{src}
    21 BuildRoot:  %{_tmppath}/%{name}-%{version}
     21BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
    2222Requires:   %{addreq}
    2323Epoch:      %(echo EEE | cut -d- -f1 | sed "s~M~~")
     
    3232
    3333%prep
    34 %{__rm}  -rf $RPM_BUILD_ROOT
    3534%setup -n %name-%{version}
    3635
     
    4241
    4342%install
     43%{__rm}  -rf $RPM_BUILD_ROOT
    4444export DONT_RELINK=1
    4545
    46 %{__rm} -rf $RPM_BUILD_ROOT
    4746export PREFIX=${RPM_BUILD_ROOT}%{_exec_prefix}
    4847export CONFDIR=${RPM_BUILD_ROOT}%{_sysconfdir}
     
    6160%files
    6261%defattr(644,root,root,755)
     62%config(noreplace) %{_sysconfdir}/mindi
    6363%config(noreplace) %{_sysconfdir}/mindi/deplist.txt
    6464%config(noreplace) %{_sysconfdir}/mindi/deplist.d/*
  • trunk/mindi/mindi

    r489 r496  
    13061306    if [ $tmpmodprobe_flag == "Y" ] ; then
    13071307        infile="/tmp/modprobe.conf.mindi.$$"
    1308         find /etc/modprobe.d -maxdepth 1 -name "*" -xtype f > $infile
     1308        find /etc/modprobe.d -maxdepth 1 -name "*" -xtype f -print0 | xargs -0 cat > $infile
    13091309    else
    13101310        infile="/etc/modules.conf"
Note: See TracChangeset for help on using the changeset viewer.