[waf/el6/master: 8/8] Merge branch 'master' into el6

[Thomas Moschny]

commit 734b8200cfc4fd71922eb38be7a4fd69c1081933
Merge: a00db7e 58a9c2a
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sat Apr 9 16:28:45 2011 +0200

    Merge branch 'master' into el6

 .gitignore             |    1 +
 repack.sh              |    2 +-
 sources                |    2 +-
 waf-1.6.2-libdir.patch |    2 +-
 waf.spec               |   65 ++++++++++++++++++++++++++++++++++++++++++++---
 5 files changed, 64 insertions(+), 8 deletions(-)
---
diff --cc waf.spec
index 00f63bf,3b97594..d1c74f4
--- a/waf.spec
+++ b/waf.spec
@@@ -1,9 -1,15 +1,15 @@@
+ %if (! 0%{?rhel}) || 0%{?rhel} > 6
+ %global with_python3 1
+ # Turn off the brp-python-bytecompile script
+ %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
+ %endif
+ 
  # Enable building without html docs (e.g. in case no recent sphinx is
  # available)
 -%global with_docs 1
 +%global with_docs 0
  
  Name:           waf
- Version:        1.6.2
+ Version:        1.6.3
  Release:        2%{?dist}
  Summary:        A Python-based build system
  Group:          Development/Tools
@@@ -104,9 -140,27 +140,28 @@@ rm -rf %{buildroot
  
  
  %changelog
+ * Sat Apr  9 2011 Thomas Moschny <thomas.moschny at gmx.de> - 1.6.3-2
+ - Use python-sphinx10 where available.
+ - Turn off standard brp-python-bytecompile only when building the
+   python3 subpackage.
+ 
+ * Sat Feb 19 2011 Thomas Moschny <thomas.moschny at gmx.de> - 1.6.3-1
+ - Update to 1.6.3.
+ 
+ * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.2-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
+ * Sat Jan 22 2011 Thomas Moschny <thomas.moschny at gmx.de> - 1.6.2-4
+ - Update libdir patch for py3k.
+ - Add patch to fix syntax error in extras/boost.py.
+ - Remove hidden file.
+ 
+ * Fri Jan 21 2011 Thomas Moschny <thomas.moschny at gmx.de> - 1.6.2-3
+ - Make waf compatible with python3, if available.
+ 
  * Tue Jan 18 2011 Thomas Moschny <thomas.moschny at gmx.de> - 1.6.2-2
 -- Enable building without html docs.
 +- Enable building without html docs, and disable it for EL-6 for now,
 +  until python-sphinx10 is available (see bz 670041).
  
  * Sat Jan 15 2011 Thomas Moschny <thomas.moschny at gmx.de> - 1.6.2-1
  - Update to 1.6.2.