[pypy/f16: 10/10] Merge branch 'master' into f16

[dmalcolm]

commit 8f8d2646a11d182e490fc6b28da50b5fa62b18b1
Merge: 0f832fb 07098c8
Author: David Malcolm <dmalcolm at redhat.com>
Date:   Fri Feb 10 14:28:58 2012 -0500

    Merge branch 'master' into f16
    
    Conflicts:
    	pypy.spec

 .gitignore                                         |    2 +
 config.patch                                       |   25 +++
 ...est_commands-expected-ls-output-issue7108.patch |   11 --
 ...able-c-code.patch => more-readable-c-code.patch |   96 ++++++------
 pypy-1.4.1-add-LIBRARY_INSTALLATION_PATH.patch     |   16 --
 pypy-1.5-config.patch                              |   39 -----
 ...test-subprocess-with-nonreadable-path-dir.patch |    7 +-
 pypy.spec                                          |  170 +++++++++++++++-----
 sources                                            |    2 +-
 9 files changed, 211 insertions(+), 157 deletions(-)
---
diff --cc pypy.spec
index bf2f246,8b80611..7f08e4e
--- a/pypy.spec
+++ b/pypy.spec
@@@ -823,9 -891,36 +891,35 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
+ * Fri Feb 10 2012 David Malcolm <dmalcolm at redhat.com> - 1.8-2
+ - disable C readability patch for now (patch 4)
+ 
+ * Thu Feb  9 2012 David Malcolm <dmalcolm at redhat.com> - 1.8-1
+ - 1.8; regenerate config patch (patch 0); drop selinux patch (patch 2);
+ regenerate patch 5
+ 
+ * Tue Jan 31 2012 David Malcolm <dmalcolm at redhat.com> - 1.7-4
+ - fix an incompatibility with virtualenv (rhbz#742641)
+ 
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
+ * Fri Dec 16 2011 David Malcolm <dmalcolm at redhat.com> - 1.7-2
+ - use --gcrootfinder=shadowstack, and use standard Fedora compilation flags,
+ with -Wno-unused (rhbz#666966 and rhbz#707707)
+ 
+ * Mon Nov 21 2011 David Malcolm <dmalcolm at redhat.com> - 1.7-1
+ - 1.7: refresh patch 0 (configuration) and patch 4 (readability of generated
+ code)
+ 
+ * Tue Oct  4 2011 David Malcolm <dmalcolm at redhat.com> - 1.6-7
 -- skip test_multiprocessing
 -
 -* Tue Sep 13 2011 David Malcolm <dmalcolm at redhat.com> - 1.6-6
+ - don't ship the emacs JIT-viewer on el5 and el6 (missing emacs-filesystem;
+ missing _emacs_bytecompile macro on el5)
 -
 -* Mon Sep 12 2011 David Malcolm <dmalcolm at redhat.com> - 1.6-5
+ - build using python26 on el5 (2.4 is too early)
++
 +* Tue Oct  4 2011 David Malcolm <dmalcolm at redhat.com> - 1.6-5
 +- skip test_multiprocessing
 +
  * Thu Aug 25 2011 David Malcolm <dmalcolm at redhat.com> - 1.6-4
  - fix SkipTest function to avoid corrupting the name of "test_gdbm"