[make/f16: 3/4] Merge branch 'master' of ssh://pkgs.fedoraproject.org/make

[Petr Machata]

commit d15338db6719054b17701476912572ab8ca2ee5c
Merge: 88ea130 122b5f0
Author: Petr Machata <pmachata at redhat.com>
Date:   Thu Nov 3 10:35:26 2011 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/make
    
    Conflicts:
    	make.spec

 make.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc make.spec
index 541d682,f5aa545..2d04c59
--- a/make.spec
+++ b/make.spec
@@@ -3,7 -3,7 +3,7 @@@ Summary: A GNU tool which simplifies th
  Name: make
  Epoch: 1
  Version: 3.82
--Release: 7%{?dist}
++Release: 8%{?dist}
  License: GPLv2+
  Group: Development/Tools
  URL: http://www.gnu.org/software/make/
@@@ -90,10 -87,9 +90,13 @@@ f
  %{_infodir}/*.info*
  
  %changelog
- * Thu Nov  3 2011 Petr Machata <pmachata at redhat.com> - 1:3.82-7
++* Thu Nov  3 2011 Petr Machata <pmachata at redhat.com> - 1:3.82-8
 +- Add a patch for preserving -j across Makefile rebuild
 +- Resolves: #698702
 +
+ * Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.82-7
+ - Rebuilt for glibc bug#747377
+ 
  * Tue May 12 2011 Lubomir Rintel <lkundrak at v3.sk> - 1:3.82-6
  - Fix free-after-use with nested assignments (#703104)