[patch/f14/master: 16/16] Merge branch 'f13' into f14

[Tim Waugh]

commit a39aa6f7c74a967f818a8408dfbc92399de83314
Merge: 0de4e78 a1c89f8
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Aug 6 17:33:44 2010 +0100

    Merge branch 'f13' into f14

 patch-selinux.patch |    2 +-
 patch.spec          |   12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)
---
diff --cc patch.spec
index ad0c68c,32b7a06..b8fa01f
--- a/patch.spec
+++ b/patch.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: Utility for modifying/upgrading files
  Name: patch
  Version: 2.6.1
--Release: 3%{?dist}
++Release: 4%{?dist}
  License: GPLv2+
  URL: http://www.gnu.org/software/patch/patch.html
  Group: Development/Tools
@@@ -58,9 -61,13 +61,16 @@@ rm -rf $RPM_BUILD_ROO
  %{_mandir}/*/*
  
  %changelog
 -* Fri Aug  6 2010 Tim Waugh <twaugh at redhat.com> 2.6.1-3
++* Fri Aug  6 2010 Tim Waugh <twaugh at redhat.com> 2.6.1-4
+ - Fixed interpretation of return value from getfilecon().
+ - Fixed argument type for --get (bug #553624).
+ 
 -* Wed Mar 10 2010 Dennis Gilmore <dennis at ausil.us>
++* Fri Aug  6 2010 Dennis Gilmore <dennis at ausil.us>
+ - using -fstack-projector causes weirdness on 32 bit sparc so disabling for now
+ 
 +* Tue Jul 27 2010 Tim Waugh <twaugh at redhat.com> 2.6.1-3
 +- Fixed argument type for --get (bug #553624).
 +
  * Wed Mar  3 2010 Tim Waugh <twaugh at redhat.com> 2.6.1-2
  - Added comments for all patches.
  - Ship COPYING file.