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

[Tim Waugh]

commit 40f33bcfae0ff027f193dc1cc87c5a7c89ff64a2
Merge: 5b20afc d09d8af
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Jan 4 12:50:55 2011 +0000

    Merge branch 'f13' into f14

 patch.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc patch.spec
index 70b18ba,0acca9e..e64cf94
--- 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: 5%{?dist}
++Release: 6%{?dist}
  License: GPLv2+
  URL: http://www.gnu.org/software/patch/patch.html
  Group: Development/Tools
@@@ -61,10 -61,13 +61,13 @@@ rm -rf $RPM_BUILD_ROO
  %{_mandir}/*/*
  
  %changelog
 -* Tue Jan  4 2011 Tim Waugh <twaugh at redhat.com> 2.6.1-5
++* Tue Jan  4 2011 Tim Waugh <twaugh at redhat.com> 2.6.1-6
+ - Use smp_mflags correctly (bug #665770).
+ 
 -* Mon Aug 16 2010 Tim Waugh <twaugh at redhat.com> 2.6.1-4
 +* Mon Aug 16 2010 Tim Waugh <twaugh at redhat.com> 2.6.1-5
  - Another fix for the selinux patch (bug #618215).
  
 -* 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).