Changeset 496 in MondoRescue for trunk/mindi/distributions

Timestamp:

Apr 22, 2006, 1:10:04 AM (18 years ago)

Author:

bcornec

Message:

merge -r 489:495 $SVN_M/branches/stable

Location:

trunk/mindi/distributions

Files:

• redhat/changelog (copied) (copied from branches/stable/mindi/distributions/redhat/changelog )
• redhat/spec.m4 (modified) (1 diff)
• rpm/mindi.spec (modified) (4 diffs)
• suse/changelog (copied) (copied from branches/stable/mindi/distributions/suse/changelog )

trunk/mindi/distributions/redhat/spec.m4

@@ -2 +2 @@
 dnl
 dnl SSS is replaced by the source package format
-define(`SSS', %{name}-%{version}.tgz)dnl
+define(`SSS', ftp://ftp.mondorescue.org/src/%{name}-%{version}.tgz)dnl
 dnl DDD is replaced by the list of dependencies specific to that distro
 define(`DDD', %{addreqb}, which, grep >= 2.5)dnl
 dnl GRP is replaced by the RPM group of apps
-define(`GRP', Archiving/Archiving)dnl
+define(`GRP', Applications/Archiving)dnl

trunk/mindi/distributions/rpm/mindi.spec

@@ -17 +17 @@
 License:    GPL
 Group:      %{grp}
-Url:        http://mondorescue.berlios.de
+Url:        http://www.mondorescue.org
 Source:     %{src}
-BuildRoot:  %{_tmppath}/%{name}-%{version}
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 Requires:   %{addreq}
 Epoch:      %(echo EEE | cut -d- -f1 | sed "s~M~~")
@@ -32 +32 @@
 
 %prep
-%{__rm}  -rf $RPM_BUILD_ROOT
 %setup -n %name-%{version}
 
@@ -42 +41 @@
 
 %install
+%{__rm}  -rf $RPM_BUILD_ROOT
 export DONT_RELINK=1
 
-%{__rm} -rf $RPM_BUILD_ROOT
 export PREFIX=${RPM_BUILD_ROOT}%{_exec_prefix}
 export CONFDIR=${RPM_BUILD_ROOT}%{_sysconfdir}
@@ -61 +60 @@
 %files
 %defattr(644,root,root,755)
+%config(noreplace) %{_sysconfdir}/mindi
 %config(noreplace) %{_sysconfdir}/mindi/deplist.txt 
 %config(noreplace) %{_sysconfdir}/mindi/deplist.d/*