thm pushed to waf (epel9). "Update to 1.8.15."
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:43 UTC
From f78443958d7b1df339a67578846662f3a2f10ae4 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Oct 24 2015 12:39:09 +0000
Subject: Update to 1.8.15.
---
diff --git a/.gitignore b/.gitignore
index a364281..7d8d6d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
/waf-1.8.11.stripped.tar.bz2
/waf-1.8.12.stripped.tar.bz2
/waf-1.8.14.stripped.tar.bz2
+/waf-1.8.15.stripped.tar.bz2
diff --git a/repack.sh b/repack.sh
index b7b7fe5..721ae45 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,6 +1,6 @@
#! /bin/bash
-version=1.8.14
+version=1.8.15
prerel=
src=waf-${version}${prerel}.tar.bz2
diff --git a/sources b/sources
index c84cc45..438cc3b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d1c7c61b37872d15496dbb4a4ec256d9 waf-1.8.14.stripped.tar.bz2
+5f3325df07fdd4c73225fd00fc09a989 waf-1.8.15.stripped.tar.bz2
diff --git a/waf-1.8.15-sphinx-theme.patch b/waf-1.8.15-sphinx-theme.patch
new file mode 100644
index 0000000..a523524
--- /dev/null
+++ b/waf-1.8.15-sphinx-theme.patch
@@ -0,0 +1,16 @@
+diff -up waf-1.8.15/docs/sphinx/conf.py.orig waf-1.8.15/docs/sphinx/conf.py
+--- waf-1.8.15/docs/sphinx/conf.py.orig 2015-10-20 09:27:38.787867271 +0200
++++ waf-1.8.15/docs/sphinx/conf.py 2015-10-24 12:29:30.497809066 +0200
+@@ -396,7 +396,11 @@ pygments_style = 'sphinx'
+
+ # The theme to use for HTML and HTML Help pages. See the documentation for
+ # a list of builtin themes.
+-html_theme = 'classic'
++from sphinx import version_info
++if (1, 3) <= version_info:
++ html_theme = 'classic'
++else:
++ html_theme = 'default'
+
+ # Theme options are theme-specific and customize the look and feel of a theme
+ # further. For a list of options available for each theme, see the
diff --git a/waf.spec b/waf.spec
index 553683c..2485ec8 100644
--- a/waf.spec
+++ b/waf.spec
@@ -13,7 +13,7 @@
%undefine prerel
Name: waf
-Version: 1.8.14
+Version: 1.8.15
Release: %{?prerel:0.}1%{?prerel:.%prerel}%{?dist}
Summary: A Python-based build system
Group: Development/Tools
@@ -30,6 +30,7 @@ Source: waf-%{version}%{?prerel}.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
+Patch3: waf-1.8.15-sphinx-theme.patch
BuildArch: noarch
@@ -111,6 +112,8 @@ This package contains the HTML documentation for %{name}.
%patch1 -p1
# do not add -W when running sphinx-build
%patch2 -p1
+# support sphinx < 1.3
+%patch3 -p1
%build
@@ -209,6 +212,9 @@ rm -f docs/sphinx/build/html/.buildinfo
%changelog
+* Sat Oct 24 2015 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.8.15-1
+- Update to 1.8.15.
+
* Sun Oct 11 2015 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.8.14-1
- Update to 1.8.14.
- Include waf-2 and waf-3 symlinks, respectively.
https://src.fedoraproject.org/rpms/waf/c/f78443958d7b1df339a67578846662f3...
2Â years, 2Â months
thm pushed to waf (epel9). "Update to 1.8.14. (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:43 UTC
From b7c5272a46e885fe7116149f0425baa324d82f1f Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Oct 11 2015 07:41:42 +0000
Subject: Update to 1.8.14.
- Include waf-2 and waf-3 symlinks, respectively.
- Add basic doc files to the python3 subpackage.
---
diff --git a/.gitignore b/.gitignore
index 3ecab31..a364281 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
/waf-1.8.9.stripped.tar.bz2
/waf-1.8.11.stripped.tar.bz2
/waf-1.8.12.stripped.tar.bz2
+/waf-1.8.14.stripped.tar.bz2
diff --git a/repack.sh b/repack.sh
index 95e9430..b7b7fe5 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,6 +1,6 @@
#! /bin/bash
-version=1.8.12
+version=1.8.14
prerel=
src=waf-${version}${prerel}.tar.bz2
diff --git a/sources b/sources
index db7bbc7..c84cc45 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dea1ed77a4896e320aadecc3281a88f5 waf-1.8.12.stripped.tar.bz2
+d1c7c61b37872d15496dbb4a4ec256d9 waf-1.8.14.stripped.tar.bz2
diff --git a/waf.spec b/waf.spec
index 57d6767..553683c 100644
--- a/waf.spec
+++ b/waf.spec
@@ -13,7 +13,7 @@
%undefine prerel
Name: waf
-Version: 1.8.12
+Version: 1.8.14
Release: %{?prerel:0.}1%{?prerel:.%prerel}%{?dist}
Summary: A Python-based build system
Group: Development/Tools
@@ -155,8 +155,10 @@ popd
# install the frontend
install -m 0755 -p -D waf-light %{buildroot}%{_bindir}/waf-%{python2_version}
+ln -s waf-%{python2_version} %{buildroot}%{_bindir}/waf-2
%if 0%{?with_python3}
install -m 0755 -p -D waf-light %{buildroot}%{_bindir}/waf-%{python3_version}
+ln -s waf-%{python3_version} %{buildroot}%{_bindir}/waf-3
%endif # with_python3
ln -s waf-%{python2_version} %{buildroot}%{_bindir}/waf
@@ -187,12 +189,15 @@ rm -f docs/sphinx/build/html/.buildinfo
%doc README TODO ChangeLog demos
%{_bindir}/waf
%{_bindir}/waf-%{python2_version}
+%{_bindir}/waf-2
%{_datadir}/waf
%if 0%{?with_python3}
%files -n %{name}-python3
+%doc README TODO ChangeLog demos
%{_bindir}/waf-%{python3_version}
+%{_bindir}/waf-3
%{_datadir}/waf3
%endif # with_python3
@@ -204,6 +209,11 @@ rm -f docs/sphinx/build/html/.buildinfo
%changelog
+* Sun Oct 11 2015 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.8.14-1
+- Update to 1.8.14.
+- Include waf-2 and waf-3 symlinks, respectively.
+- Add basic doc files to the python3 subpackage.
+
* Sat Jul 25 2015 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.8.12-1
- Update to 1.8.12.
https://src.fedoraproject.org/rpms/waf/c/b7c5272a46e885fe7116149f0425baa3...
2Â years, 2Â months
thm pushed to waf (epel9). "Update to 1.8.12."
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:43 UTC
From e30faa421b6bd788e2e3b82fb266a3cfe374bb24 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Jul 25 2015 10:34:28 +0000
Subject: Update to 1.8.12.
---
diff --git a/.gitignore b/.gitignore
index 1884ab8..3ecab31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
/waf-1.8.8.stripped.tar.bz2
/waf-1.8.9.stripped.tar.bz2
/waf-1.8.11.stripped.tar.bz2
+/waf-1.8.12.stripped.tar.bz2
diff --git a/repack.sh b/repack.sh
index 49496dd..95e9430 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,6 +1,6 @@
#! /bin/bash
-version=1.8.11
+version=1.8.12
prerel=
src=waf-${version}${prerel}.tar.bz2
diff --git a/sources b/sources
index 4102a95..db7bbc7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd8e8a299bff33c3fdf9107b1b39ac9d waf-1.8.11.stripped.tar.bz2
+dea1ed77a4896e320aadecc3281a88f5 waf-1.8.12.stripped.tar.bz2
diff --git a/waf.spec b/waf.spec
index 1391091..57d6767 100644
--- a/waf.spec
+++ b/waf.spec
@@ -13,8 +13,8 @@
%undefine prerel
Name: waf
-Version: 1.8.11
-Release: %{?prerel:0.}2%{?prerel:.%prerel}%{?dist}
+Version: 1.8.12
+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)
@@ -204,6 +204,9 @@ rm -f docs/sphinx/build/html/.buildinfo
%changelog
+* Sat Jul 25 2015 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.8.12-1
+- Update to 1.8.12.
+
* Mon Jun 22 2015 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.8.11-2
- Patch to remove -W from sphinx-build call, in order to build with
older sphinx.
https://src.fedoraproject.org/rpms/waf/c/e30faa421b6bd788e2e3b82fb266a3cf...
2Â years, 2Â months
thm pushed to waf (epel9). "Patch to remove -W from sphinx-build call,
in order to build with (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:43 UTC
From a6481a6215f5bdf219060333afc1a670a18ba411 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Jun 22 2015 19:50:38 +0000
Subject: Patch to remove -W from sphinx-build call, in order to build with
older sphinx.
- Rebase libdir patch.
---
diff --git a/waf-1.6.2-libdir.patch b/waf-1.6.2-libdir.patch
deleted file mode 100644
index 2a50438..0000000
--- a/waf-1.6.2-libdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- waf-light.orig 2010-11-25 11:11:50.000000000 +0100
-+++ waf-light 2011-01-15 15:22:53.485315375 +0100
-@@ -145,6 +145,9 @@
- w = test(i + '/lib/' + dirname)
- if w: return w
-
-+ w = test('/usr/share/%s' % WAF)
-+ if w: return w
-+
- #waf-local
- dir = join(base, (sys.platform != 'win32' and '.' or '') + dirname)
- w = test(dir)
diff --git a/waf-1.8.11-libdir.patch b/waf-1.8.11-libdir.patch
new file mode 100644
index 0000000..faa88f2
--- /dev/null
+++ b/waf-1.8.11-libdir.patch
@@ -0,0 +1,13 @@
+diff -up waf-1.8.11/waf-light.orig waf-1.8.11/waf-light
+--- waf-1.8.11/waf-light.orig 2015-06-20 22:24:00.000000000 +0200
++++ waf-1.8.11/waf-light 2015-06-22 20:23:07.171667528 +0200
+@@ -149,6 +149,9 @@ def find_lib():
+ w = test(i + '/lib/' + dirname)
+ if w: return w
+
++ w = test('/usr/share/%s' % WAF)
++ if w: return w
++
+ #waf-local
+ dir = join(base, (sys.platform != 'win32' and '.' or '') + dirname)
+ w = test(dir)
diff --git a/waf-1.8.11-sphinx-no-W.patch b/waf-1.8.11-sphinx-no-W.patch
new file mode 100644
index 0000000..a8f3cef
--- /dev/null
+++ b/waf-1.8.11-sphinx-no-W.patch
@@ -0,0 +1,11 @@
+diff -up waf-1.8.11/docs/sphinx/wscript.orig waf-1.8.11/docs/sphinx/wscript
+--- waf-1.8.11/docs/sphinx/wscript.orig 2015-06-11 18:11:04.000000000 +0200
++++ waf-1.8.11/docs/sphinx/wscript 2015-06-22 18:36:02.078701412 +0200
+@@ -19,7 +19,6 @@ def configure(cfg):
+ cfg.find_program('convert', var='CONVERT')
+ cfg.load('daemon', tooldir=['../../playground/daemon/'])
+ cfg.find_program("sphinx-build", var="SPHINX_BUILD")
+- cfg.env.SPHINX_ARGS = ['-W']
+
+ def build(bld):
+ bld.path.make_node('_static').mkdir()
diff --git a/waf.spec b/waf.spec
index 0e8f62a..1391091 100644
--- a/waf.spec
+++ b/waf.spec
@@ -14,7 +14,7 @@
Name: waf
Version: 1.8.11
-Release: %{?prerel:0.}1%{?prerel:.%prerel}%{?dist}
+Release: %{?prerel:0.}2%{?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)
@@ -27,8 +27,9 @@ URL: https://github.com/waf-project/waf
# - docs/book, licensed CC BY-NC-ND
# - Waf logos, licensed CC BY-NC
Source: waf-%{version}%{?prerel}.stripped.tar.bz2
-Patch0: waf-1.6.2-libdir.patch
+Patch0: waf-1.8.11-libdir.patch
Patch1: waf-1.6.9-logo.patch
+Patch2: waf-1.8.11-sphinx-no-W.patch
BuildArch: noarch
@@ -105,9 +106,11 @@ This package contains the HTML documentation for %{name}.
%prep
%setup -q
# also search for waflib in /usr/share/waf
-%patch0 -p0
+%patch0 -p1
# do not try to use the (removed) waf logos
%patch1 -p1
+# do not add -W when running sphinx-build
+%patch2 -p1
%build
@@ -201,6 +204,11 @@ rm -f docs/sphinx/build/html/.buildinfo
%changelog
+* Mon Jun 22 2015 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.8.11-2
+- Patch to remove -W from sphinx-build call, in order to build with
+ older sphinx.
+- Rebase libdir patch.
+
* Mon Jun 22 2015 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.8.11-1
- Update to 1.8.11.
https://src.fedoraproject.org/rpms/waf/c/a6481a6215f5bdf219060333afc1a670...
2Â years, 2Â months
thm pushed to waf (epel9). "Update to 1.8.11."
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:43 UTC
From 3646c737902521b35c54a5bc378c16f1f0cd1c13 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Jun 22 2015 14:42:44 +0000
Subject: Update to 1.8.11.
---
diff --git a/.gitignore b/.gitignore
index 3600b91..1884ab8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
/waf-1.8.7.stripped.tar.bz2
/waf-1.8.8.stripped.tar.bz2
/waf-1.8.9.stripped.tar.bz2
+/waf-1.8.11.stripped.tar.bz2
diff --git a/repack.sh b/repack.sh
index ec271cb..49496dd 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,6 +1,6 @@
#! /bin/bash
-version=1.8.9
+version=1.8.11
prerel=
src=waf-${version}${prerel}.tar.bz2
diff --git a/sources b/sources
index dfe634f..4102a95 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5aaa2557029e1eccc2e67609c12f6267 waf-1.8.9.stripped.tar.bz2
+fd8e8a299bff33c3fdf9107b1b39ac9d waf-1.8.11.stripped.tar.bz2
diff --git a/waf.spec b/waf.spec
index 235e6a0..0e8f62a 100644
--- a/waf.spec
+++ b/waf.spec
@@ -13,8 +13,8 @@
%undefine prerel
Name: waf
-Version: 1.8.9
-Release: %{?prerel:0.}1%{?prerel:.%prerel}%{?dist}.1
+Version: 1.8.11
+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)
@@ -201,6 +201,9 @@ rm -f docs/sphinx/build/html/.buildinfo
%changelog
+* Mon Jun 22 2015 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.8.11-1
+- Update to 1.8.11.
+
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.8.9-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
https://src.fedoraproject.org/rpms/waf/c/3646c737902521b35c54a5bc378c16f1...
2Â years, 2Â months
thm pushed to waf (epel9). "Update to 1.8.9."
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:43 UTC
From 44cbca525035243569e628c2178b868d4dba1665 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: May 01 2015 14:11:37 +0000
Subject: Update to 1.8.9.
---
diff --git a/.gitignore b/.gitignore
index b875f45..3600b91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
/waf-1.8.6.stripped.tar.bz2
/waf-1.8.7.stripped.tar.bz2
/waf-1.8.8.stripped.tar.bz2
+/waf-1.8.9.stripped.tar.bz2
diff --git a/repack.sh b/repack.sh
index 296f3db..ec271cb 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,6 +1,6 @@
#! /bin/bash
-version=1.8.8
+version=1.8.9
prerel=
src=waf-${version}${prerel}.tar.bz2
diff --git a/sources b/sources
index 7d3f8af..dfe634f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c4d59b3101047ad6e1cccfe0d037b8d7 waf-1.8.8.stripped.tar.bz2
+5aaa2557029e1eccc2e67609c12f6267 waf-1.8.9.stripped.tar.bz2
diff --git a/waf.spec b/waf.spec
index 576dd39..a2f4ccd 100644
--- a/waf.spec
+++ b/waf.spec
@@ -13,8 +13,8 @@
%undefine prerel
Name: waf
-Version: 1.8.8
-Release: %{?prerel:0.}2%{?prerel:.%prerel}%{?dist}
+Version: 1.8.9
+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)
@@ -201,6 +201,10 @@ rm -f docs/sphinx/build/html/.buildinfo
%changelog
+* Fri May 1 2015 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.8.9-1
+- Update to 1.8.9.
+- Update upstream URL.
+
* Sun Apr 19 2015 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.8.8-2
- Project moved to github.
https://src.fedoraproject.org/rpms/waf/c/44cbca525035243569e628c2178b868d...
2Â years, 2Â months
thm pushed to waf (epel9). "Update to 1.8.7."
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:43 UTC
From 17f7b897eb17fd155d3b964d3ed644dedf369d96 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Mar 01 2015 14:37:16 +0000
Subject: Update to 1.8.7.
---
diff --git a/.gitignore b/.gitignore
index b7ba92c..e41b612 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
/waf-1.8.4.stripped.tar.bz2
/waf-1.8.5.stripped.tar.bz2
/waf-1.8.6.stripped.tar.bz2
+/waf-1.8.7.stripped.tar.bz2
diff --git a/repack.sh b/repack.sh
index 94c1e17..ff330b4 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,6 +1,6 @@
#! /bin/bash
-version=1.8.6
+version=1.8.7
prerel=
src=waf-${version}${prerel}.tar.bz2
diff --git a/sources b/sources
index 483d496..9429986 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-142832b1ed7a0519b42c8d6606a424e5 waf-1.8.6.stripped.tar.bz2
+dd1ab8ca1c5be6d79b17124df0ad64f5 waf-1.8.7.stripped.tar.bz2
diff --git a/waf.spec b/waf.spec
index b2182b7..ff4f202 100644
--- a/waf.spec
+++ b/waf.spec
@@ -13,7 +13,7 @@
%undefine prerel
Name: waf
-Version: 1.8.6
+Version: 1.8.7
Release: %{?prerel:0.}1%{?prerel:.%prerel}%{?dist}
Summary: A Python-based build system
Group: Development/Tools
@@ -199,6 +199,9 @@ rm -f docs/sphinx/build/html/.buildinfo
%changelog
+* Sun Mar 1 2015 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.8.7-1
+- Update to 1.8.7.
+
* Sun Feb 22 2015 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.8.6-1
- Update to 1.8.6.
https://src.fedoraproject.org/rpms/waf/c/17f7b897eb17fd155d3b964d3ed644de...
2Â years, 2Â months
thm pushed to waf (epel9). "Update to 1.8.8. (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:43 UTC
From 176fd9f775e0dd121ea51db4baab384dd409faee Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Apr 19 2015 14:51:57 +0000
Subject: Update to 1.8.8.
- Apply updated Python packaging guidelines.
---
diff --git a/.gitignore b/.gitignore
index e41b612..b875f45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
/waf-1.8.5.stripped.tar.bz2
/waf-1.8.6.stripped.tar.bz2
/waf-1.8.7.stripped.tar.bz2
+/waf-1.8.8.stripped.tar.bz2
diff --git a/repack.sh b/repack.sh
index ff330b4..296f3db 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,6 +1,6 @@
#! /bin/bash
-version=1.8.7
+version=1.8.8
prerel=
src=waf-${version}${prerel}.tar.bz2
diff --git a/sources b/sources
index 9429986..7d3f8af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dd1ab8ca1c5be6d79b17124df0ad64f5 waf-1.8.7.stripped.tar.bz2
+c4d59b3101047ad6e1cccfe0d037b8d7 waf-1.8.8.stripped.tar.bz2
diff --git a/waf.spec b/waf.spec
index ff4f202..1d340c9 100644
--- a/waf.spec
+++ b/waf.spec
@@ -13,7 +13,7 @@
%undefine prerel
Name: waf
-Version: 1.8.7
+Version: 1.8.8
Release: %{?prerel:0.}1%{?prerel:.%prerel}%{?dist}
Summary: A Python-based build system
Group: Development/Tools
@@ -21,7 +21,8 @@ Group: Development/Tools
License: BSD and Python
URL: http://code.google.com/p/waf/
# Original tarfile can be found at
-# http://ftp.waf.io/pub/release/waf-%%{version}.tar.bz2
+# 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
@@ -31,7 +32,7 @@ Patch1: waf-1.6.9-logo.patch
BuildArch: noarch
-BuildRequires: python-devel
+BuildRequires: python2-devel
%if 0%{?with_python3}
BuildRequires: python3-devel
%endif # with_python3
@@ -44,10 +45,10 @@ BuildRequires: python-sphinx10
BuildRequires: graphviz
BuildRequires: ImageMagick
%endif # with_docs
-%if "%{?python_version}" != ""
+%if "%{?python2_version}" != ""
# Seems like automatic ABI dependency is not detected since the files are
# going to a non-standard location
-Requires: python(abi) = %{python_version}
+Requires: python(abi) = %{python2_version}
%endif
@@ -134,12 +135,13 @@ popd
# use waf so it unpacks itself
mkdir _temp ; pushd _temp
cp -av ../waf .
-%{__python} ./waf >/dev/null 2>&1
+%{__python2} ./waf >/dev/null 2>&1
pushd .waf-%{version}-*
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}-*
find . -name '*.py' -printf '%%P\0' |
@@ -149,18 +151,18 @@ popd
popd
# install the frontend
-install -m 0755 -p -D waf-light %{buildroot}%{_bindir}/waf-%{python_version}
+install -m 0755 -p -D waf-light %{buildroot}%{_bindir}/waf-%{python2_version}
%if 0%{?with_python3}
install -m 0755 -p -D waf-light %{buildroot}%{_bindir}/waf-%{python3_version}
%endif # with_python3
-ln -s waf-%{python_version} %{buildroot}%{_bindir}/waf
+ln -s waf-%{python2_version} %{buildroot}%{_bindir}/waf
# remove shebangs from and fix EOL for all scripts in wafadmin
find %{buildroot}%{_datadir}/ -name '*.py' \
-exec sed -i -e '1{/^#!/d}' -e 's|\r$||g' {} \;
# fix waf script shebang line
-sed -i "1c#! %{__python}" %{buildroot}%{_bindir}/waf-%{python_version}
+sed -i "1c#! %{__python2}" %{buildroot}%{_bindir}/waf-%{python2_version}
%if 0%{?with_python3}
sed -i "1c#! %{__python3}" %{buildroot}%{_bindir}/waf-%{python3_version}
%endif # with_python3
@@ -173,7 +175,7 @@ rm -f docs/sphinx/build/html/.buildinfo
%if 0%{?with_python3}
# do byte compilation
-%py_byte_compile %{__python} %{buildroot}%{_datadir}/waf
+%py_byte_compile %{__python2} %{buildroot}%{_datadir}/waf
%py_byte_compile %{__python3} %{buildroot}%{_datadir}/waf3
%endif # with_python3
@@ -181,7 +183,7 @@ rm -f docs/sphinx/build/html/.buildinfo
%files
%doc README TODO ChangeLog demos
%{_bindir}/waf
-%{_bindir}/waf-%{python_version}
+%{_bindir}/waf-%{python2_version}
%{_datadir}/waf
@@ -199,6 +201,10 @@ rm -f docs/sphinx/build/html/.buildinfo
%changelog
+* Sun Apr 19 2015 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.8.8-1
+- Update to 1.8.8.
+- Apply updated Python packaging guidelines.
+
* Sun Mar 1 2015 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.8.7-1
- Update to 1.8.7.
https://src.fedoraproject.org/rpms/waf/c/176fd9f775e0dd121ea51db4baab384d...
2Â years, 2Â months