Changeset 532 in MondoRescue for branches/stable/mondo/distributions

Timestamp:

May 12, 2006, 1:21:13 AM (20 years ago)

Author:

bcornec

Message:

Fix a bug in rpm generation
Adds mondo conf file
Remove useless mondo-makefilelist
Rudimentary Script for the test env.
Preparation of the separation of log_msg function in a standalone file
Pass sysconfdir variable from configure system to mondoarchive to find conf file

Location:

branches/stable/mondo/distributions

Files:

• conf/mondo.conf (modified) (5 diffs)
• rpm/mondo-doc.spec (copied) (copied from branches/stable/mondo/distributions/rpm/mondo.spec ) (5 diffs)

branches/stable/mondo/distributions/conf/mondo.conf

@@ -30 +30 @@
 #
 #  ISO Burning CLI command options
-iso_burning_options="-eject dev=%s speed=%d fs=24m"
+iso_burning_options="-eject dev=%s speed=%d fs=24m driveropts=burnfree"
 
 #
-# ISO Burning Speed
+# ISO Burning Speed (optional)
 #
-iso_burning_speed=1
+#iso_burning_speed=1
 
 #
@@ -62 +62 @@
 
 #
-# prefix for ISO names
+# default prefix for ISO names
 #
 prefix=mondorescue
-
-#
-# Size of the boot image for ia64
-#
-ia64_boot_size=8192
 
 #
@@ -141 +136 @@
 
 #
+# Paths to include onto the backup
+# (white space separated list of paths)
+#
+include_files=""
+
+#
 # Activate semi-graphical mode by default (yes|no)
 #
@@ -147 +148 @@
 #
 # Activate automatic restore (Use with caution) (yes|no)
+# (look at -H option in man page)
 #
 automatic_restore=no
@@ -165 +167 @@
 # Images creation dir
 #
-images_dir="/root/images/mindi"
+images_dir="/var/cache/mondo"

branches/stable/mondo/distributions/rpm/mondo-doc.spec

@@ -3 +3 @@
 #
 
-%define name    mondo
+%define name    mondo-doc
 %define version VVV
 %define mrel    RRR
@@ -10 +10 @@
 %define src     SSS
 %define grp     GRP
-%define addreqb mindi >= 1.0.7, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1
 %define addreq  DDD
 %define rel     %{mrel}
 
-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é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
+Summary:    Documentation for Mondo Rescue
+Summary(fr):    Documentation pour Mondo Rescue
 
 Name:       %{name}
@@ -27 +24 @@
 Source:     %{src}
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
-BuildRequires:  newt-devel >= 0.50, slang-devel >= 1.4.1, gcc
+BuildRequires:  docbook-utils
 Epoch:      %(echo EEE | cut -d- -f1 | sed "s~M~~")
 OBS
-%ifarch ia64
-Requires:   %{addreq}, elilo, parted
-%else
-Requires:   %{addreq}, syslinux >= 1.52
-%endif
 
 %description
-Mondo is a GPL disaster recovery solution to create backup media 
-(CD, DVD, tape, network images) that can be used to redeploy the 
-damaged system, as well as deploy similar or less similar systems.
+Documentation for Mondo Rescue
 
 %description -l fr
-Objectif
-""""""""
-Mondo est une solution GPL de sauvegarde en cas de désastre pour 
-créer des médias (CD, DVD, bande, images réseau) qui peuvent être 
-utilisés pour redéployer le système endomangé, aussi bien que des 
-systèmes similaires, ou moins similaires.
-
-%description -l it
-Scopo
-"""""
-Mondo e' un programma che permette a qualsiasi utente Linux 
-di creare un cd di rescue/restore (o piu' cd qualora l'installazione 
-dovesse occupare piu' di 2Gb circa). Funziona con gli azionamenti di
-nastro, ed il NFS, anche.
-
-%description -l sp
-Objectivo
-"""""""""
-Mondo es un programa que permite cualquier usuario de Linux a crear una CD
-de restoracion/rescate (o CDs, si su instalacion es >2GO aprox.).  Funciona 
-con cintas y NFS, tambien.
+Documentation pour Mondo Rescue
 
 %prep
@@ -68 +38 @@
 
 %build
-%configure --program-prefix=%{?_program_prefix}
 %{__make} VERSION=%{version}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-%makeinstall
+%make -f Makefile.man install INSTALLDIR=$RPM_BUILDROOT/$RPM_DOC_DIR/%name-%{version}
+%make -f Makefile.howto install INSTALLDIR=$RPM_BUILDROOT/$RPM_DOC_DIR/%name-%{version}
 
 %clean
@@ -80 +50 @@
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog svn.log
-%doc INSTALL COPYING README TODO AUTHORS NEWS
-%doc docs/en/mondorescue-howto.html docs/en/mondorescue-howto.pdf
-
-%attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_datadir}/%{name}/restore-scripts/%{name}/*
-%attr(755,root,root) %{_datadir}/%{name}/autorun
-%attr(755,root,root) %{_datadir}/%{name}/post-nuke.sample/usr/bin/post-nuke
-%{_datadir}/locale/*/LC_MESSAGES/mondo.mo
-%{_datadir}/%{name}/*
-%{_mandir}/man8/*
+%doc svn.log
+%doc 
 
 %changelog