[rear: 2/2] merge from F-16 as rawhide should ALWAYS have the latest release

[Peter Robinson]

commit 20b63099b8cabf6c5b388903071d0fdcb6b07751
Merge: f945184 9f2870f
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Mar 4 13:46:18 2012 +0000

    merge from F-16 as rawhide should ALWAYS have the latest release

 .gitignore |    2 +-
 rear.spec  |   63 ++++++++++++++++++++---------------------------------------
 sources    |    2 +-
 3 files changed, 24 insertions(+), 43 deletions(-)
---
diff --cc rear.spec
index 487c472,b2f1b31..8e883a3
--- a/rear.spec
+++ b/rear.spec
@@@ -8,17 -8,17 +8,12 @@@ License: GPLv2
  URL: http://rear.sourceforge.net
  Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
  BuildArch: noarch
--BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
  
  # all RPM based systems seem to have this
- Requires: mingetty binutils iputils tar gzip ethtool
+ Requires: mingetty binutils iputils tar gzip ethtool parted
  Requires: iproute redhat-lsb
--%if 0%{?fedora_version} >= 9
  Requires: genisoimage rpcbind
--%else
--Requires: mkisofs portmap
--%endif
--%ifarch %ix86 x86_64 amd64
++%ifarch %ix86 x86_64
  Requires: syslinux
  %endif
  
@@@ -40,7 -40,7 +35,6 @@@ bare metal disaster recovery abilities 
  # no code to compile - all bash scripts
  
  %install
--rm -rf $RPM_BUILD_ROOT
  # create directories
  mkdir -vp \
  	$RPM_BUILD_ROOT%{_mandir}/man8 \
@@@ -69,13 -69,14 +63,11 @@@ sed	-e 's#/etc#%{_sysconfdir}#' 
  
  # remove doc files under  $RPM_BUILD_ROOT/usr/share/rear
  rm -f $RPM_BUILD_ROOT%{_datadir}/rear/README
- rm -f $RPM_BUILD_ROOT%{_datadir}/rear/CHANGES
  rm -f $RPM_BUILD_ROOT%{_datadir}/rear/COPYING
+ rm -f $RPM_BUILD_ROOT%{_datadir}/rear/AUTHORS
+ rm -f $RPM_BUILD_ROOT%{_datadir}/rear/TODO
  rm -rf $RPM_BUILD_ROOT%{_datadir}/rear/doc/*
  
--%clean
--rm -rf $RPM_BUILD_ROOT
--
  
  %files
  %defattr(-,root,root,-)
@@@ -89,11 -90,12 +81,19 @@@
  
  
  %changelog
- * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.25-3
++* Sun Mar  4 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.12.0-3
++- merge F-16 newer version to F-17+
++- Clean out long obsolete Fedora versions (F-9) checks
++
++* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12.0-2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +
- * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.25-2
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ * Mon Nov 21 2011 Gratien D'haese <gdha at sourceforge.net> - 1.12.0-1
+ - placeholder for release
+ 
+ * Mon Jan 24 2011 Gratien D'haese <gdha at sourceforge.net> - 1.9-1
+ - New development release with P2V, V2V functionality, and more
+ - added AUTHORS, TODO to %%doc and rm from datadir
  
  * Fri Jun 04 2010 Gratien D'haese <gdha at sourceforge.net> - 1.7.25-1
  - added the %%ifarch part for syslinux to avoid warning on ppc/ppc64