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

Timestamp:

Feb 14, 2006, 11:36:15 PM (18 years ago)

Author:

bcornec

Message:

RPMs are now made with a .spec containing m4 macros expanded with tools/mkrpm
this allows for a simpler spec file at the end,
which should be suited for at least Mandriva official packages.
Added a new mkspec tool which does the expansion
This way of dealing with distributions will be used is some other areas in the future

Location:

branches/stable/mondo/distributions

Files:

• debian (added)
• mandriva (added)
• mandriva/spec.m4 (added)
• redhat (added)
• redhat/spec.m4 (added)
• rpm (moved) (moved from branches/stable/mondo/distributions/common )
• rpm/mondo.spec (modified) (2 diffs)
• rpm/mondorescue.conf (modified) (2 diffs)
• suse (added)
• suse/spec.m4 (added)

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

@@ -2 +2 @@
 # $Id$
 #
-%define is_mandriva %(test -e /etc/mandriva-release && echo 1 || echo 0)
-%define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0)
-%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0)
-%define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0)
-%define is_redhat %(test -e /etc/redhat-release && echo 1 || echo 0)
 
 %define name    mondo
@@ -13 +8 @@
 # if mandriva official build (rpm --with is_official)
 %{?is_official:%define rel %{mkrel} %{mrel}}%{!?is_official:%define rel %{mrel}}
-%define src     %{name}-%{version}.tgz
-%define grp     Archiving/Backup
+%define src     SSS
+%define grp     GRP
 %define addreqb mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1
-
-%if %is_redhat
-%define grp     Applications/Archiving
-%define addreq  %{addreqb}
-Autoreq:        0
-%endif
-
-%if %is_mandrake
-%define src     %{name}-%{version}.tar.bz2
-%define addreq  %{addreqb}
-Autoreqprov:    no
-%endif
-
-%if %is_mandriva
-%define src     %{name}-%{version}.tar.bz2
-%define addreq  %{addreqb}
-Autoreqprov:    no
-%endif
-
-%if %is_suse
-%define addreq  %{addreqb}
-%endif
 
 Summary:    A program which a Linux user can utilize to create a rescue/restore CD/tape

branches/stable/mondo/distributions/rpm/mondorescue.conf

@@ -5 +5 @@
 # We tried to give sensible defaults in this file.
 # Changing some values may render mondorescue instable
-# or causes failures. Use with care.
+# or cause failures. Use with care.
 
 
@@ -165 +165 @@
 # Images creation dir
 #
-image_dir="/root/images/mindi"
+images_dir="/root/images/mindi"