Changeset 460


Ignore:
Timestamp:
Apr 3, 2006, 12:50:50 AM (13 years ago)
Author:
bcornec
Message:

merge -r 453:456 $SVN_M/branches/2.0.7 (delivery process adapted for 2.0.7)

Location:
branches/stable
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/distributions/rpm/mindi.spec

    r454 r460  
    2121BuildRoot:  %{_tmppath}/%{name}-%{version}
    2222Requires:   %{addreq}
     23Epoch:      %(echo EEE | cut -d- -f1 | sed "s~M~~")
    2324# Not on all systems
    2425#Conflicts: bonnie++
  • branches/stable/mindi/install.sh

    r454 r460  
    112112fi
    113113
     114# Special case for SuSE family wher doc is put elsewhere in the RPM
     115if [ _"$dfam" != _"suse" ] then;
     116    rm -rf $DOCDIR
     117fi
     118
    114119exit 0
  • branches/stable/mondo/distributions/mandriva/spec.m4

    r388 r460  
    77dnl GRP is replaced by the RPM group of apps
    88define(`GRP', `Archiving/Backup')dnl
     9dnl OBS is replaced vy what is being obsoleted
     10define(`OBS', Obsoletes:    libmondo <= 2.04)dnl
  • branches/stable/mondo/distributions/redhat/spec.m4

    r388 r460  
    77dnl GRP is replaced by the RPM group of apps
    88define(`GRP', Archiving/Archiving)dnl
     9dnl OBS is replaced vy what is being obsoleted
     10define(`OBS', )dnl
  • branches/stable/mondo/distributions/rpm/mondo.spec

    r452 r460  
    1515
    1616Summary:    A program which a Linux user can utilize to create a rescue/restore CD/tape
    17 Summary(fr):    Un programme pour les utilisateurs de Linux pour cr�r un CD/tape de sauvegarde/restauration
     17Summary(fr):    Un programme pour les utilisateurs de Linux pour créer un CD/tape de sauvegarde/restauration
    1818Summary(it):    Un programma per utenti Linux per creare un CD/tape di rescue
    1919Summary(sp):    Un programa para los usuarios de Linux por crear una CD/cinta de restoracion/rescate
     
    2828BuildRoot:  %{_tmppath}/%{name}-%{version}
    2929BuildRequires:  newt-devel >= 0.50, slang-devel >= 1.4.1, gcc
     30Epoch:      %(echo EEE | cut -d- -f1 | sed "s~M~~")
     31OBS
    3032%ifarch ia64
    3133Requires:   %{addreq}, elilo, parted
  • branches/stable/mondo/distributions/suse/spec.m4

    r401 r460  
    77dnl GRP is replaced by the RPM group of apps
    88define(`GRP', Productivity/Archiving/Backup)dnl
     9dnl OBS is replaced vy what is being obsoleted
     10define(`OBS', )dnl
  • branches/stable/tools/mkspec

    r445 r460  
    2525cat >> /tmp/mondorescue.mc << EOF
    2626define(\`RRR', ${REVISION}${suf})dnl
     27define(\`EEE', ${REVISION})dnl
    2728define(\`VVV', ${1})dnl
    2829EOF
Note: See TracChangeset for help on using the changeset viewer.