Changeset 495


Ignore:
Timestamp:
Apr 20, 2006, 10:23:15 AM (14 years ago)
Author:
bcornec
Message:

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

Location:
branches/2.0.7/mindi
Files:
3 edited
2 copied

Legend:

Unmodified
Added
Removed
  • branches/2.0.7/mindi/distributions/redhat/spec.m4

    r388 r495  
    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
  • branches/2.0.7/mindi/distributions/rpm/mindi.spec

    r456 r495  
    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)
    63 %config(noreplace) %{_sysconfdir}/mindi/deplist.txt
     62%config(noreplace) %{_sysconfdir}/mindi
     63%config(noreplace) %{_sysconfdir}/mindi/deplist.txt
    6464%doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox svn.log
    6565%{_mandir}/man8/*
  • branches/2.0.7/mindi/mindi

    r491 r495  
    12541254    if [ $tmpmodprobe_flag == "Y" ] ; then
    12551255        infile="/tmp/modprobe.conf.mindi.$$"
    1256         find /etc/modprobe.d -maxdepth 1 -name "*" -xtype f | xargs cat > $infile
     1256        find /etc/modprobe.d -maxdepth 1 -name "*" -xtype f -print0 | xargs -0 cat > $infile
    12571257    else
    12581258        infile="/etc/modules.conf"
Note: See TracChangeset for help on using the changeset viewer.