Changeset 729 in MondoRescue for trunk/mondo/distributions

Timestamp:

Jul 30, 2006, 4:06:39 PM (19 years ago)

Author:

Bruno Cornec

Message:

merge -r686:728 $SVN_M/branches/stable

Location:

trunk/mondo/distributions

Files:

• mandriva/spec.m4 (modified) (2 diffs)
• redhat/spec.m4 (modified) (1 diff)
• rpm/mondo.spec (modified) (5 diffs)
• suse/spec.m4 (modified) (2 diffs)

trunk/mondo/distributions/mandriva/spec.m4

@@ -2 +2 @@
 dnl
 dnl SSS is replaced by the source package format
-define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.bz2')dnl
+define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl
 dnl DDD is replaced by the list of dependencies specific to that distro
 define(`DDD', )dnl
@@ -8 +8 @@
 define(`GRP', `Archiving/Backup')dnl
 dnl OBS is replaced with what is being obsoleted
-define(`OBS', `Obsoletes:   libmondo <= 2.04
+define(`OBS', `Obsoletes:   libmondo
 Provides:   libmondo')dnl

trunk/mondo/distributions/redhat/spec.m4

@@ -2 +2 @@
 dnl
 dnl SSS is replaced by the source package format
-define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.gz')dnl
+define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.gz')dnl
 dnl DDD is replaced by the list of dependencies specific to that distro
 define(`DDD', )dnl

trunk/mondo/distributions/rpm/mondo.spec

@@ -3 +3 @@
 #
 
-%define mrel    RRR
-%define tag     TTT
-# if mandriva official build (rpm --with is_official)
-%{?is_official:%define rel %{mkrel} %{mrel}}%{!?is_official:%define rel %{mrel}}
-%define addreq  mindi >= 1.0.7, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1 DDD
+%define addreq  mindi >= 1.0.7, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, DDD
 
 Summary:    A program which a Linux user can utilize to create a rescue/restore CD/tape
@@ -16 +12 @@
 Name:       mondo
 Version:    VVV
-Release:    %{mrel}
+Release:    RRR
 License:    GPL
 Group:      GRP
@@ -22 +18 @@
 Source:     SSS
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
-BuildRequires:  newt-devel >= 0.50, slang-devel >= 1.4.1, gcc
+BuildRequires:  newt-devel >= 0.50, gcc
 OBS
 %ifarch ia64
@@ -59 +55 @@
 
 %prep
-%setup -q -n %name-%{version}-%{tag}
+%setup -q -n %name-%{version}
 
 %build
@@ -76 +72 @@
 
 %files
+%defattr(-,root,root)
 %doc ChangeLog svn.log
 %doc INSTALL COPYING README TODO AUTHORS NEWS

trunk/mondo/distributions/suse/spec.m4

@@ -2 +2 @@
 dnl
 dnl SSS is replaced by the source package format
-define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.gz')dnl
+define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl
 dnl DDD is replaced by the list of dependencies specific to that distro
 define(`DDD', `, buffer, cdrecord')dnl
@@ -8 +8 @@
 define(`GRP', `Productivity/Archiving/Backup')dnl
 dnl OBS is replaced vy what is being obsoleted
-define(`OBS', )dnl
+define(`OBS', `Obsoletes: mondo <= 2.06')dnl