Changeset 576 in MondoRescue for branches/2.0.8/mondo/distributions/rpm/mondo.spec

Timestamp:

May 25, 2006, 2:00:37 PM (18 years ago)

Author:

bcornec

Message:

2.08 synced with stable as of r575
VERSION files updated

File:

• branches/2.0.8/mondo/distributions/rpm/mondo.spec (modified) (5 diffs)

branches/2.0.8/mondo/distributions/rpm/mondo.spec

@@ -3 +3 @@
 #
 
-%define name    mondo
-%define version VVV
 %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 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}
+%define addreq  mindi >= 1.0.7, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1 DDD
 
 Summary:    A program which a Linux user can utilize to create a rescue/restore CD/tape
@@ -19 +14 @@
 Summary(sp):    Un programa para los usuarios de Linux por crear una CD/cinta de restoracion/rescate
 
-Name:       %{name}
-Version:    %{version}
-Release:    %{rel}
+Name:       mondo
+Version:    VVV
+Release:    %{mrel}
 License:    GPL
-Group:      %{grp}
+Group:      GRP
 Url:        http://www.mondorescue.org
-Source:     %{src}
+Source:     SSS
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:  newt-devel >= 0.50, slang-devel >= 1.4.1, gcc
-Epoch:      %(echo EEE | cut -d- -f1 | sed "s~M~~")
 OBS
 %ifarch ia64
@@ -65 +59 @@
 
 %prep
-%setup -q -n %name-%{version}
+%setup -q -n %name-%{version}-%{tag}
 
 %build
@@ -79 +73 @@
 
 %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
 
+<<<<<<< .working
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_datadir}/%{name}/restore-scripts/%{name}/*
@@ -89 +83 @@
 %attr(755,root,root) %{_datadir}/%{name}/post-nuke.sample/usr/bin/post-nuke
 %{_datadir}/%{name}/*
+=======
+%{_sbindir}/*
+%{_datadir}/%{name}
+>>>>>>> .merge-right.r575
 %{_mandir}/man8/*