diff --git a/repack.sh b/repack.sh index 632b126..b4a0624 100755 --- a/repack.sh +++ b/repack.sh @@ -1,20 +1,19 @@ #! /bin/bash -version=2.0.21 +set -euxo pipefail + +version=2.1.9 prerel= src=waf-${version}${prerel}.tar.bz2 dst=${src%.tar.bz2}.stripped.tar.bz2 -rm -f ${dst} ${dst%.bz2} -cp -av ${src} ${dst} +readarray -t files <<-EOF + waf-${version}/docs/sphinx/_images/waf-64x64.png + waf-${version}/docs/slides/presentation/gfx/waflogo.svg +EOF -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} - -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 ef12096..49df050 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (waf-2.0.21.stripped.tar.bz2) = 0a205061253e84a1b65a1250b2603d97c17ef160cba1476db0b6b95320035f8e31ecf4600e13855ee1bc1d864acc0ecfdb8808c4555e33d9a8ef90c96ab1f395 +SHA512 (waf-2.1.9.stripped.tar.bz2) = 51df87254b4826247c36f86ac8df4a2dcb47322dc6747a63f4f2fb78962136d52add1d6089a65d76ff89c800f52715c14991e71216f82419e0733a5914523e05 diff --git a/waf.spec b/waf.spec index 47c48ca..6646d2a 100644 --- a/waf.spec +++ b/waf.spec @@ -1,12 +1,13 @@ Name: waf -Version: 2.0.21 +Version: 2.1.9 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 +# Automatically converted from old format: BSD and Python - review is highly recommended. +License: LicenseRef-Callaway-BSD AND LicenseRef-Callaway-Python URL: https://waf.io/ # Original tarfile can be found at -# https://waf.io/waf-%%{version}.tar.bz2 or +# https://waf.io/waf-%%{version}.tar.bz2 # We remove waf logos, licensed CC BY-NC Source: waf-%{version}.stripped.tar.bz2 Source1: unpack_wafdir.py @@ -137,6 +138,90 @@ rm -f docs/sphinx/build/html/.buildinfo %changelog +* Sat Nov 15 2025 Thomas Moschny - 2.1.9-1 +- Update to 2.1.9. + +* Fri Sep 19 2025 Python Maint - 2.1.6-4 +- Rebuilt for Python 3.14.0rc3 bytecode + +* Fri Aug 15 2025 Python Maint - 2.1.6-3 +- Rebuilt for Python 3.14.0rc2 bytecode + +* Fri Jul 25 2025 Fedora Release Engineering - 2.1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri Jun 20 2025 Thomas Moschny - 2.1.6-1 +- Update to 2.1.6. + +* Tue Jun 03 2025 Python Maint - 2.1.5-2 +- Rebuilt for Python 3.14 + +* Sun Mar 9 2025 Thomas Moschny - 2.1.5-1 +- Update to 2.1.5. + +* Sun Jan 19 2025 Fedora Release Engineering - 2.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Sep 7 2024 Thomas Moschny - 2.1.2-1 +- Update to 2.1.2. + +* Wed Sep 04 2024 Miroslav Suchý - 2.0.27-4 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 2.0.27-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 2.0.27-2 +- Rebuilt for Python 3.13 + +* Thu Apr 4 2024 Thomas Moschny - 2.0.27-1 +- Update to 2.0.27. + +* Sat Jan 27 2024 Fedora Release Engineering - 2.0.26-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Oct 22 2023 Thomas Moschny - 2.0.26-1 +- Update to 2.0.26. + +* Sat Jul 22 2023 Fedora Release Engineering - 2.0.25-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jun 14 2023 Python Maint - 2.0.25-3 +- Rebuilt for Python 3.12 + +* Sat Jan 21 2023 Fedora Release Engineering - 2.0.25-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jan 5 2023 Thomas Moschny - 2.0.25-1 +- Update to 2.0.25. + +* Sat Jul 23 2022 Fedora Release Engineering - 2.0.24-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 2.0.24-2 +- Rebuilt for Python 3.11 + +* Sat May 28 2022 Thomas Moschny - 2.0.24-1 +- Update to 2.0.24. + +* Sat Jan 22 2022 Fedora Release Engineering - 2.0.23-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Dec 22 2021 Thomas Moschny - 2.0.23-1 +- Update to 2.0.23. + +* Fri Jul 23 2021 Fedora Release Engineering - 2.0.22-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 2.0.22-2 +- Rebuilt for Python 3.10 + +* Tue Feb 2 2021 Thomas Moschny - 2.0.22-1 +- Update to 2.0.22. + +* Wed Jan 27 2021 Fedora Release Engineering - 2.0.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Nov 16 2020 Thomas Moschny - 2.0.21-1 - Update to 2.0.21.