From 6e358fd70b37baa9d6151bf8353356f05129b46a Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm@fedoraproject.org>
Date: Mon, 16 Jul 2012 22:36:08 +0200
Subject: [PATCH] Update to 1.7.0.

---
 .gitignore |  1 +
 repack.sh  |  2 +-
 sources    |  2 +-
 waf.spec   | 10 ++++++++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0da341d..46ca528 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /waf-1.7.0pre3.stripped.tar.bz2
 /waf-1.7.0pre4.stripped.tar.bz2
 /waf-1.7.0pre5.stripped.tar.bz2
+/waf-1.7.0.stripped.tar.bz2
diff --git a/repack.sh b/repack.sh
index ef97548..ff13c50 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 version=1.7.0
-prerel=pre5
+prerel=
 
 src=waf-${version}${prerel}.tar.bz2
 dst=${src%.tar.bz2}.stripped.tar.bz2
diff --git a/sources b/sources
index a3c68f3..d538106 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-825e73204c4dd7bd3d63ba35f14fff61  waf-1.7.0pre5.stripped.tar.bz2
+9162a5c2a33c2f5201d7e0806604cd42  waf-1.7.0.stripped.tar.bz2
diff --git a/waf.spec b/waf.spec
index 971efea..54bebfd 100644
--- a/waf.spec
+++ b/waf.spec
@@ -10,11 +10,11 @@
 %global with_docs 1
 
 # For pre-releases
-%global prerel pre5
+%undefine prerel
 
 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)
@@ -108,6 +108,9 @@ This package contains the HTML documentation for %{name}.
 # do not try to use the (removed) waf logos
 %patch1 -p1
 
+# remove BOM, causes trouble later
+sed -i -e '1s/^\xEF\xBB\xBF//' waflib/extras/dpapi.py
+
 
 %build
 extras=
@@ -206,6 +209,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jul 16 2012 Thomas Moschny <thomas.moschny@gmx.de> - 1.7.0-1
+- Update to 1.7.0.
+
 * Sat Jun 16 2012 Thomas Moschny <thomas.moschny@gmx.de> - 1.7.0-0.2.pre5
 - Update to 1.7.0pre5.