From 9d94005453be6ed0a78c29e806f89645c76c0232 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm@fedoraproject.org>
Date: Wed, 22 Dec 2021 14:36:19 +0100
Subject: [PATCH] Update to 2.0.23.

---
 repack.sh | 23 +++++++++++------------
 sources   |  2 +-
 waf.spec  |  7 +++++--
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/repack.sh b/repack.sh
index 37da33e..0ebbfcd 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,20 +1,19 @@
 #! /bin/bash
 
-version=2.0.22
+set -euxo pipefail
+
+version=2.0.23
 prerel=
 
 src=waf-${version}${prerel}.tar.bz2
 dst=${src%.tar.bz2}.stripped.tar.bz2
 
-rm -f ${dst} ${dst%.bz2}
-cp -av ${src} ${dst}
-
-bzip2 -d ${dst}
-
-tar --delete --file=${dst%.bz2} \
-     waf-${version}/docs/sphinx/_images/waf-64x64.png \
-     waf-${version}/docs/slides/presentation/gfx/waflogo.svg
-
-touch -m -r ${src} ${dst%.bz2}
+readarray -t files <<-EOF
+	waf-${version}/docs/sphinx/_images/waf-64x64.png
+	waf-${version}/docs/slides/presentation/gfx/waflogo.svg
+EOF
 
-bzip2 ${dst%.bz2}
+# tar's "--delete option has been reported to work properly when tar
+# acts as a filter from stdin to stdout."
+bzip2 -cd "${src}" | tar --delete "${files[@]}" | bzip2 -c > "${dst}"
+touch -m -r "${src}" "${dst}"
diff --git a/sources b/sources
index c4be169..6122cf9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (waf-2.0.22.stripped.tar.bz2) = 360bb6509e515ecf5efeb73d10c909abd518223d6d2124f395ffe1de77096d237891a44f92058e86deaa5f84f0aa322e72c1fbd5ed33f74a3d71e3acdc7bbfa7
+SHA512 (waf-2.0.23.stripped.tar.bz2) = 1d0e34db8e34025ae8eb7480219fe94d523657dcdf547588768a8c0dc2ee486284effec250e0a54619fd21914f24b769a29521500aaf5e5f74b29a4b0dc1c154
diff --git a/waf.spec b/waf.spec
index 1b1b9cd..07a4b1f 100644
--- a/waf.spec
+++ b/waf.spec
@@ -1,6 +1,6 @@
 Name:           waf
-Version:        2.0.22
-Release:        3%{?dist}
+Version:        2.0.23
+Release:        1%{?dist}
 Summary:        A Python-based build system
 # The entire source code is BSD apart from pproc.py (taken from Python 2.5)
 License:        BSD and Python
@@ -137,6 +137,9 @@ rm -f docs/sphinx/build/html/.buildinfo
 
 
 %changelog
+* Wed Dec 22 2021 Thomas Moschny <thomas.moschny@gmx.de> - 2.0.23-1
+- Update to 2.0.23.
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.22-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild