[yaboot/f18: 2/2] Merge branch 'f17'

[Tony Breeds]

commit 850985283e2cd5b1c77958dd87b27c5959f12535
Merge: 52acfa1 b275d8e
Author: Tony Breeds <tony at bakeyournoodle.com>
Date:   Wed Sep 5 11:15:18 2012 +1000

    Merge branch 'f17'
    
    Conflicts:
    	yaboot.spec

 yaboot-1.3.17-link_with_new_e2fsprogs.patch |  380 +++++++++++++++++++++++++++
 yaboot.spec                                 |    7 +-
 2 files changed, 386 insertions(+), 1 deletions(-)
---
diff --cc yaboot.spec
index 75e38f4,01189b8..6678071
--- a/yaboot.spec
+++ b/yaboot.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: Linux bootloader for Power Macintosh "New World" computers.
  Name: yaboot
  Version: 1.3.17
--Release: 4%{?dist}
++Release: 5%{?dist}
  License: GPLv2+
  Group: System Environment/Base
  Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@@ -113,9 -115,9 +115,12 @@@ rm -rf $RPM_BUILD_ROO
  %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
  
  %changelog
 -* Wed Sep 05 2012 Tony Breeds <tony at bakeyournoodle.com> - 1.3.17-4
++* Wed Sep 05 2012 Tony Breeds <tony at bakeyournoodle.com> - 1.3.17-5
+ - Add patch from upstream to link with newer e2fsprogs
+ 
 +* Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.17-4
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 +
  * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.17-3
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild