Merge branch 'f13' into f14

patch.spec

@@ -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
@@ -42,7 +42,7 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
 CFLAGS=`echo $CFLAGS|sed -e 's|-fstack-protector||g'`
 %endif
 %configure
-make %{?smp_mflags}
+make %{?_smp_mflags}
 
 %check
 make check
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Tue Jan  4 2011 Tim Waugh <twaugh@redhat.com> 2.6.1-6
+- Use smp_mflags correctly (bug #665770).
+
 * Mon Aug 16 2010 Tim Waugh <twaugh@redhat.com> 2.6.1-5
 - Another fix for the selinux patch (bug #618215).