[waf] Update to 1.7.0pre4.

[Thomas Moschny]

commit dfdf8b372e7c702eda73ce36e3c84259f2e00cd0
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Thu Jun 7 19:10:01 2012 +0200

    Update to 1.7.0pre4.

 .gitignore                   |    1 +
 repack.sh                    |    2 +-
 sources                      |    2 +-
 waf-1.7.0pre3-encoding.patch |   13 -------------
 waf.spec                     |   10 +++++-----
 5 files changed, 8 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9b3b787..9214948 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /waf-1.6.11.stripped.tar.bz2
 /waf-1.7.0pre3.stripped.tar.bz2
+/waf-1.7.0pre4.stripped.tar.bz2
diff --git a/repack.sh b/repack.sh
index 2d7ba3f..a925cca 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 version=1.7.0
-prerel=pre3
+prerel=pre4
 
 src=waf-${version}${prerel}.tar.bz2
 dst=${src%.tar.bz2}.stripped.tar.bz2
diff --git a/sources b/sources
index b1acc8b..7bbdce0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-07bbf9ac9848809999bd9036ebef601f  waf-1.7.0pre3.stripped.tar.bz2
+4691d8cffab7606bdd9d680d47bcfba6  waf-1.7.0pre4.stripped.tar.bz2
diff --git a/waf.spec b/waf.spec
index 9f565d6..323aa21 100644
--- a/waf.spec
+++ b/waf.spec
@@ -10,11 +10,11 @@
 %global with_docs 1
 
 # For pre-releases
-%global prerel pre3
+%global prerel pre4
 
 Name:           waf
 Version:        1.7.0
-Release:        %{?prerel:0.}2%{?prerel:.%prerel}%{?dist}
+Release:        %{?prerel:0.}1%{?prerel:.%prerel}%{?dist}
 Summary:        A Python-based build system
 Group:          Development/Tools
 # The entire source code is BSD apart from pproc.py (taken from Python 2.5)
@@ -28,7 +28,6 @@ URL:            http://code.google.com/p/waf/
 Source:         waf-%{version}%{?prerel}.stripped.tar.bz2
 Patch0:         waf-1.6.2-libdir.patch
 Patch1:         waf-1.6.9-logo.patch
-Patch2:         waf-1.7.0pre3-encoding.patch
 
 BuildArch:      noarch
 
@@ -108,8 +107,6 @@ This package contains the HTML documentation for %{name}.
 %patch0 -p0
 # do not try to use the (removed) waf logos
 %patch1 -p1
-# fix for http://code.google.com/p/waf/issues/detail?id=1171
-%patch2 -p1
 
 
 %build
@@ -209,6 +206,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jun  7 2012 Thomas Moschny <thomas.moschny at gmx.de> - 1.7.0-0.1.pre4
+- Update to 1.7.0pre4.
+
 * Thu Jun  7 2012 Thomas Moschny <thomas.moschny at gmx.de> - 1.7.0-0.2.pre3
 - Add patch for waf issue #1171.
 - Spec file fixes.