Changeset 461 in MondoRescue for trunk/mondo

Timestamp:

Apr 4, 2006, 9:40:52 AM (18 years ago)

Author:

bcornec

Message:

merge -r447:460 $SVN_M/branches/stable

Location:

trunk/mondo/distributions

Files:

• conf/mondo.conf (copied) (copied from branches/stable/mondo/distributions/conf/mondo.conf )
• conf/mondorescue.conf (deleted)
• mandriva/spec.m4 (modified) (1 diff)
• redhat/spec.m4 (modified) (1 diff)
• rpm/mondo.spec (modified) (3 diffs)
• suse/spec.m4 (modified) (1 diff)

trunk/mondo/distributions/mandriva/spec.m4

@@ -7 +7 @@
 dnl GRP is replaced by the RPM group of apps
 define(`GRP', `Archiving/Backup')dnl
+dnl OBS is replaced vy what is being obsoleted
+define(`OBS', Obsoletes:    libmondo <= 2.04)dnl

trunk/mondo/distributions/redhat/spec.m4

@@ -7 +7 @@
 dnl GRP is replaced by the RPM group of apps
 define(`GRP', Archiving/Archiving)dnl
+dnl OBS is replaced vy what is being obsoleted
+define(`OBS', )dnl

trunk/mondo/distributions/rpm/mondo.spec

@@ -14 +14 @@
 
 Summary:    A program which a Linux user can utilize to create a rescue/restore CD/tape
-Summary(fr):    Un programme pour les utilisateurs de Linux pour cr�r un CD/tape de sauvegarde/restauration
+Summary(fr):    Un programme pour les utilisateurs de Linux pour créer un CD/tape de sauvegarde/restauration
 Summary(it):    Un programma per utenti Linux per creare un CD/tape di rescue
 Summary(sp):    Un programa para los usuarios de Linux por crear una CD/cinta de restoracion/rescate
@@ -27 +27 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}
 BuildRequires:  newt-devel >= 0.50, slang-devel >= 1.4.1, gcc
+Epoch:      %(echo EEE | cut -d- -f1 | sed "s~M~~")
+OBS
 %ifarch ia64
 Requires:   %{addreq}, elilo, parted
@@ -65 +67 @@
 
 %build
-%configure
+%configure --program-prefix=%{?_program_prefix}
 %{__make} VERSION=%{version}
 

trunk/mondo/distributions/suse/spec.m4

@@ -7 +7 @@
 dnl GRP is replaced by the RPM group of apps
 define(`GRP', Productivity/Archiving/Backup)dnl
+dnl OBS is replaced vy what is being obsoleted
+define(`OBS', )dnl