thm pushed to waf (epel9). "Update to 2.0.14."
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:44 UTC
From 94b437e4f619c65c8c2b9af1772e9fb67e001e05 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Dec 30 2018 19:25:17 +0000
Subject: Update to 2.0.14.
---
diff --git a/repack.sh b/repack.sh
index f8f69cd..0f1641f 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,6 +1,6 @@
#! /bin/bash
-version=2.0.12
+version=2.0.14
prerel=
src=waf-${version}${prerel}.tar.bz2
diff --git a/sources b/sources
index 7634cf2..44db2db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (waf-2.0.12.stripped.tar.bz2) = ea895a0df1e0549fd782f035cd275713ed4565a7d8ed88243a4d1fadd125634238a5fe11e92977418ce917a8fc48f1ef79b46dc3a2fe970ec6f510555f2328d7
+SHA512 (waf-2.0.14.stripped.tar.bz2) = 90c341558e6916d9b5d414d3fbef6214c83eeed6a62372bc51ceaf6483499c3c217f29233a09ff65fc99aafbcb1ed98fc9113e70748dc8397306c761615c4e4e
diff --git a/waf.spec b/waf.spec
index 1c1d33c..811fc30 100644
--- a/waf.spec
+++ b/waf.spec
@@ -16,7 +16,7 @@
%global waf_py2_priority 20
Name: waf
-Version: 2.0.12
+Version: 2.0.14
Release: 1%{?dist}
Summary: A Python-based build system
# The entire source code is BSD apart from pproc.py (taken from Python 2.5)
@@ -243,6 +243,9 @@ rm -f docs/sphinx/build/html/.buildinfo
%changelog
+* Sun Dec 30 2018 Thomas Moschny <thomas.moschny(a)gmx.de> - 2.0.14-1
+- Update to 2.0.14.
+
* Mon Nov 12 2018 Thomas Moschny <thomas.moschny(a)gmx.de> - 2.0.12-1
- Update to 2.0.12.
https://src.fedoraproject.org/rpms/waf/c/94b437e4f619c65c8c2b9af1772e9fb6...
2Â years, 1Â month
thm pushed to waf (epel9). "Update to 2.0.10."
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:44 UTC
From b615096160e02a6f92c11003756f433d96975d5f Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Aug 15 2018 06:51:56 +0000
Subject: Update to 2.0.10.
---
diff --git a/repack.sh b/repack.sh
index 19c8d82..2b8b833 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,6 +1,6 @@
#! /bin/bash
-version=1.9.14
+version=2.0.10
prerel=
src=waf-${version}${prerel}.tar.bz2
diff --git a/sources b/sources
index 289e8ba..7580fb1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (waf-1.9.14.stripped.tar.bz2) = a5fc0dd9f7e4c8c701556a533c9a1d188bc3f8525c9d2a6aaaee393db136f326f1f0c8cc79e31b79defba3bc743f7f5af2c250559ea3d6ef82e543f1e9d6a745
+SHA512 (waf-2.0.10.stripped.tar.bz2) = 547ac54732ecfd48eaa09ed56269a62660ae46df12fb0a788177cce4987d53801c7f8c324cf42e9dd4d1932da35a0d2a3b6626f94204cfe2e5067d6dafd01eaf
diff --git a/waf.spec b/waf.spec
index cd9145f..da8159f 100644
--- a/waf.spec
+++ b/waf.spec
@@ -16,8 +16,8 @@
%global waf_py2_priority 20
Name: waf
-Version: 1.9.14
-Release: 2%{?dist}
+Version: 2.0.10
+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
@@ -243,6 +243,9 @@ rm -f docs/sphinx/build/html/.buildinfo
%changelog
+* Wed Aug 15 2018 Thomas Moschny <thomas.moschny(a)gmx.de> - 2.0.10-1
+- Update to 2.0.10.
+
* Fri Jul 20 2018 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.9.14-2
- Spec file cleanups.
- Add unpack_wafdir.py (rhbz#1509550).
https://src.fedoraproject.org/rpms/waf/c/b615096160e02a6f92c11003756f433d...
2Â years, 1Â month
thm pushed to waf (epel9). "Update to 2.0.12."
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:44 UTC
From 995acf242b7d2d508a6562e14df45f18ac018777 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Nov 12 2018 10:21:39 +0000
Subject: Update to 2.0.12.
---
diff --git a/repack.sh b/repack.sh
index 2b8b833..f8f69cd 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,6 +1,6 @@
#! /bin/bash
-version=2.0.10
+version=2.0.12
prerel=
src=waf-${version}${prerel}.tar.bz2
diff --git a/sources b/sources
index 7580fb1..7634cf2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (waf-2.0.10.stripped.tar.bz2) = 547ac54732ecfd48eaa09ed56269a62660ae46df12fb0a788177cce4987d53801c7f8c324cf42e9dd4d1932da35a0d2a3b6626f94204cfe2e5067d6dafd01eaf
+SHA512 (waf-2.0.12.stripped.tar.bz2) = ea895a0df1e0549fd782f035cd275713ed4565a7d8ed88243a4d1fadd125634238a5fe11e92977418ce917a8fc48f1ef79b46dc3a2fe970ec6f510555f2328d7
diff --git a/waf.spec b/waf.spec
index da8159f..1c1d33c 100644
--- a/waf.spec
+++ b/waf.spec
@@ -16,7 +16,7 @@
%global waf_py2_priority 20
Name: waf
-Version: 2.0.10
+Version: 2.0.12
Release: 1%{?dist}
Summary: A Python-based build system
# The entire source code is BSD apart from pproc.py (taken from Python 2.5)
@@ -243,6 +243,9 @@ rm -f docs/sphinx/build/html/.buildinfo
%changelog
+* Mon Nov 12 2018 Thomas Moschny <thomas.moschny(a)gmx.de> - 2.0.12-1
+- Update to 2.0.12.
+
* Wed Aug 15 2018 Thomas Moschny <thomas.moschny(a)gmx.de> - 2.0.10-1
- Update to 2.0.10.
https://src.fedoraproject.org/rpms/waf/c/995acf242b7d2d508a6562e14df45f18...
2Â years, 1Â month
thm pushed to waf (epel9). "Fix rpmlint issue (rhbz#1509716)."
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:44 UTC
From 7bef3ba1c86db1ebc348efd83385c0220b1a91c8 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Jul 19 2018 23:40:44 +0000
Subject: Fix rpmlint issue (rhbz#1509716).
---
diff --git a/waf.spec b/waf.spec
index 4d6e002..7e691bf 100644
--- a/waf.spec
+++ b/waf.spec
@@ -209,7 +209,7 @@ rm -f docs/sphinx/build/html/.buildinfo
%files
%doc README.md ChangeLog demos_py2/demos
-%ghost %{_bindir}/waf
+%ghost %attr(0755,-,-) %{_bindir}/waf
%{_bindir}/waf-%{python2_version}
%{_bindir}/waf-2
%{_datadir}/waf
@@ -228,7 +228,7 @@ rm -f docs/sphinx/build/html/.buildinfo
%files -n %{name}-python3
%doc README.md ChangeLog demos_py3/demos
-%ghost %{_bindir}/waf
+%ghost %attr(0755,-,-) %{_bindir}/waf
%{_bindir}/waf-%{python3_version}
%{_bindir}/waf-3
%{_datadir}/waf3
@@ -245,6 +245,7 @@ rm -f docs/sphinx/build/html/.buildinfo
* Fri Jul 20 2018 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.9.14-2
- Spec file cleanups.
- Add unpack_wafdir.py (rhbz#1509550).
+- Fix rpmlint issue (rhbz#1509716).
* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.9.14-1.3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
https://src.fedoraproject.org/rpms/waf/c/7bef3ba1c86db1ebc348efd83385c022...
2Â years, 1Â month
thm pushed to waf (epel9). "Fix doc building (rhbz#1512232)."
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:44 UTC
From f07eace344567701739e50a14f82dd3ce7b702d5 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Jul 19 2018 23:41:17 +0000
Subject: Fix doc building (rhbz#1512232).
---
diff --git a/waf.spec b/waf.spec
index 7e691bf..cd9145f 100644
--- a/waf.spec
+++ b/waf.spec
@@ -130,6 +130,7 @@ done
%if 0%{?with_docs}
# build html docs
+export WAFDIR=$(pwd)
pushd docs/sphinx
%if ! ( 0%{?fedora} || 0%{?rhel} >= 7 )
export SPHINX_BUILD=sphinx-1.0-build
@@ -246,6 +247,7 @@ rm -f docs/sphinx/build/html/.buildinfo
- Spec file cleanups.
- Add unpack_wafdir.py (rhbz#1509550).
- Fix rpmlint issue (rhbz#1509716).
+- Fix doc building (rhbz#1512232).
* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.9.14-1.3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
https://src.fedoraproject.org/rpms/waf/c/f07eace344567701739e50a14f82dd3c...
2Â years, 1Â month
thm pushed to waf (epel9). "Add unpack_wafdir.py (rhbz#1509550)."
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:44 UTC
From f38e89c140e2325da05b98e71308b504596f0a9b Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Jul 19 2018 23:40:06 +0000
Subject: Add unpack_wafdir.py (rhbz#1509550).
---
diff --git a/unpack_wafdir.py b/unpack_wafdir.py
new file mode 100644
index 0000000..7d3bdfa
--- /dev/null
+++ b/unpack_wafdir.py
@@ -0,0 +1,16 @@
+import os
+import sys
+
+src = os.path.abspath('waf')
+dst = os.path.abspath(sys.argv[1])
+
+sys.dont_write_bytecode = True
+
+try:
+ from importlib.machinery import SourceFileLoader
+ waf = SourceFileLoader('waf', src).load_module()
+except ImportError:
+ import imp
+ waf = imp.load_source('waf', src)
+
+waf.unpack_wafdir(dst, src)
diff --git a/waf.spec b/waf.spec
index 134d998..4d6e002 100644
--- a/waf.spec
+++ b/waf.spec
@@ -28,6 +28,7 @@ URL: https://waf.io/
# - docs/book, licensed CC BY-NC-ND
# - Waf logos, licensed CC BY-NC
Source: waf-%{version}.stripped.tar.bz2
+Source1: unpack_wafdir.py
Patch0: waf-1.8.11-libdir.patch
Patch1: waf-1.6.9-logo.patch
Patch2: waf-1.8.11-sphinx-no-W.patch
@@ -139,23 +140,18 @@ popd
%install
-# use waf so it unpacks itself
-mkdir _temp ; pushd _temp
-cp -av ../waf .
-%{__python2} ./waf >/dev/null 2>&1
-pushd .waf-%{version}-*
+%{__python2} %{S:1} _temp
+pushd _temp
find . -name '*.py' -printf '%%P\0' |
xargs -0 -I{} install -m 0644 -p -D {} %{buildroot}%{_datadir}/waf/{}
popd
%if 0%{?with_python3}
-# use waf so it unpacks itself
-%{__python3} ./waf >/dev/null 2>&1
-pushd .waf3-%{version}-*
+%{__python3} %{S:1} _temp3
+pushd _temp3
find . -name '*.py' -printf '%%P\0' |
xargs -0 -I{} install -m 0644 -p -D {} %{buildroot}%{_datadir}/waf3/{}
popd
%endif # with_python3
-popd
# install the frontend
install -m 0755 -p -D waf-light %{buildroot}%{_bindir}/waf-%{python2_version}
@@ -248,6 +244,8 @@ rm -f docs/sphinx/build/html/.buildinfo
%changelog
* Fri Jul 20 2018 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.9.14-2
- Spec file cleanups.
+- Add unpack_wafdir.py (rhbz#1509550).
+
* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.9.14-1.3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
https://src.fedoraproject.org/rpms/waf/c/f38e89c140e2325da05b98e71308b504...
2Â years, 1Â month
thm pushed to waf (epel9). "Spec file cleanups."
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:44 UTC
From 5ce22b359c235bf85e55c88cdf44f88ef5f85283 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Jul 19 2018 23:37:17 +0000
Subject: Spec file cleanups.
---
diff --git a/waf.spec b/waf.spec
index 8a93f91..134d998 100644
--- a/waf.spec
+++ b/waf.spec
@@ -1,6 +1,5 @@
%if 0%{?fedora}
%global with_python3 1
-%{!?python3_version: %global python3_version %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3])")}
%endif
%if 0%{?with_python3}
@@ -12,34 +11,23 @@
# available)
%global with_docs 1
-# For pre-releases
-%undefine prerel
-
# Priorities for the alternatives system
-%if 0%{?fedora} > 25
%global waf_py3_priority 30
%global waf_py2_priority 20
-%else
-# don't change standard binary for released Fedora versions
-%global waf_py2_priority 20
-%global waf_py3_priority 10
-%endif
Name: waf
Version: 1.9.14
-Release: %{?prerel:0.}1%{?prerel:.%prerel}%{?dist}.3
+Release: 2%{?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)
License: BSD and Python
-URL: https://github.com/waf-project/waf
+URL: https://waf.io/
# Original tarfile can be found at
# https://waf.io/waf-%%{version}.tar.bz2 or
-# http://www.freehackers.org/%7Etnagy/release/waf-%%{version}.tar.bz2
# We remove:
# - docs/book, licensed CC BY-NC-ND
# - Waf logos, licensed CC BY-NC
-Source: waf-%{version}%{?prerel}.stripped.tar.bz2
+Source: waf-%{version}.stripped.tar.bz2
Patch0: waf-1.8.11-libdir.patch
Patch1: waf-1.6.9-logo.patch
Patch2: waf-1.8.11-sphinx-no-W.patch
@@ -258,6 +246,8 @@ rm -f docs/sphinx/build/html/.buildinfo
%changelog
+* Fri Jul 20 2018 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.9.14-2
+- Spec file cleanups.
* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.9.14-1.3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
https://src.fedoraproject.org/rpms/waf/c/5ce22b359c235bf85e55c88cdf44f88e...
2Â years, 1Â month
thm pushed to waf (epel9). "Fix FTBFS."
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:44 UTC
From 952fe9f86dddc74eec164e3e68e89b8e41e6cb8c Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Jul 19 2018 09:15:52 +0000
Subject: Fix FTBFS.
---
diff --git a/waf.spec b/waf.spec
index 4c3245d..7384624 100644
--- a/waf.spec
+++ b/waf.spec
@@ -145,7 +145,7 @@ pushd docs/sphinx
%if ! ( 0%{?fedora} || 0%{?rhel} >= 7 )
export SPHINX_BUILD=sphinx-1.0-build
%endif
-../../waf -v configure build
+%{__python2} ../../waf -v configure build
popd
%endif # with_docs
https://src.fedoraproject.org/rpms/waf/c/952fe9f86dddc74eec164e3e68e89b8e...
2Â years, 1Â month
thm pushed to waf (epel9). "Merge branch 'f28'"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:44 UTC
From d96c1d6e4995792a93b71418910d2791ef8d9f8a Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Jul 19 2018 23:32:26 +0000
Subject: Merge branch 'f28'
---
diff --git a/waf.spec b/waf.spec
index bf09786..8a93f91 100644
--- a/waf.spec
+++ b/waf.spec
@@ -145,7 +145,7 @@ pushd docs/sphinx
%if ! ( 0%{?fedora} || 0%{?rhel} >= 7 )
export SPHINX_BUILD=sphinx-1.0-build
%endif
-../../waf -v configure build
+%{__python2} ../../waf -v configure build
popd
%endif # with_docs
https://src.fedoraproject.org/rpms/waf/c/d96c1d6e4995792a93b71418910d2791...
2Â years, 1Â month