thm pushed to waf (epel9). "Add patch for waf issue #1171."
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:43 UTC
From a9015182d26269ed41f8e2d013ce9337415eff1f Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Jun 07 2012 15:07:10 +0000
Subject: Add patch for waf issue #1171.
---
diff --git a/waf-1.7.0pre3-encoding.patch b/waf-1.7.0pre3-encoding.patch
new file mode 100644
index 0000000..324d2dc
--- /dev/null
+++ b/waf-1.7.0pre3-encoding.patch
@@ -0,0 +1,13 @@
+diff --git a/wscript b/wscript
+index 24aec92..189b26b 100644
+--- a/wscript
++++ b/wscript
+@@ -141,7 +141,7 @@ def process_tokens(tokens):
+ line_buf = []
+
+ for (type, token, start, end, line) in tokens:
+- token = token.replace('\r\n', '\n')
++ token = token.decode('utf-8').replace('\r\n', '\n')
+ if type == tokenize.NEWLINE:
+ if line_buf:
+ accu.append(indent * '\t')
diff --git a/waf.spec b/waf.spec
index 2cbd32c..504411d 100644
--- a/waf.spec
+++ b/waf.spec
@@ -29,6 +29,7 @@ Source: waf-%{version}%{?prerel}.stripped.tar.bz2
# use _datadir instead of /usr/lib
Patch0: waf-1.6.2-libdir.patch
Patch1: waf-1.6.9-logo.patch
+Patch2: waf-1.7.0pre3-encoding.patch
BuildArch: noarch
@@ -108,12 +109,11 @@ This package contains the HTML documentation for %{name}.
%patch0 -p0
# do not try to use the (removed) waf logos
%patch1 -p1
+# fix for http://code.google.com/p/waf/issues/detail?id=1171
+%patch2 -p1
%build
-# ticgt trips up build, see
-# http://code.google.com/p/waf/issues/detail?id=1171
-mv waflib/extras/ticgt.py{,.off}
extras=
for f in waflib/extras/*.py ; do
f=$(basename "$f" .py);
@@ -211,6 +211,7 @@ rm -rf %{buildroot}
%changelog
* Thu Jun 7 2012 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.7.0-0.2.pre3
+- Add patch for waf issue #1171.
- Spec file fixes.
* Thu Jun 7 2012 Michel Salim <salimma(a)fedoraproject.org> - 1.7.0-0.1.pre3
https://src.fedoraproject.org/rpms/waf/c/a9015182d26269ed41f8e2d013ce9337...
2Â years, 3Â months
thm pushed to waf (epel9). "Spec file fixes: Add comment to each
patch."
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:43 UTC
From 0dbeb3e14adcff5890142ee7bcb8e58765d00c6a Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Jun 07 2012 15:04:32 +0000
Subject: Spec file fixes: Add comment to each patch.
---
diff --git a/waf.spec b/waf.spec
index 0035c3f..2cbd32c 100644
--- a/waf.spec
+++ b/waf.spec
@@ -23,9 +23,8 @@ URL: http://code.google.com/p/waf/
# Original tarfile can be found at
# http://waf.googlecode.com/files/waf-%%{version}.tar.bz2
# We remove:
-# - /docs/book, as this is under CC-BY-NC-ND, which is not allowed in
-# Fedora
-# - Waf logos
+# - /docs/book, licensed CC BY-NC-ND
+# - Waf logos, licensed CC BY-NC
Source: waf-%{version}%{?prerel}.stripped.tar.bz2
# use _datadir instead of /usr/lib
Patch0: waf-1.6.2-libdir.patch
@@ -105,8 +104,10 @@ This package contains the HTML documentation for %{name}.
%prep
%setup -q
-%patch0 -p0 -b .libdir
-%patch1 -p1 -b .logo
+# also search for waflib in /usr/share/waf
+%patch0 -p0
+# do not try to use the (removed) waf logos
+%patch1 -p1
%build
https://src.fedoraproject.org/rpms/waf/c/0dbeb3e14adcff5890142ee7bcb8e587...
2Â years, 3Â months
thm pushed to waf (epel9). "Spec file fixes: Make %%prerel optional."
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:43 UTC
From a136f910622cb7da76b0381c3d32372e94cb18e6 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Jun 07 2012 15:02:30 +0000
Subject: Spec file fixes: Make %%prerel optional.
---
diff --git a/waf.spec b/waf.spec
index 2abe98c..0035c3f 100644
--- a/waf.spec
+++ b/waf.spec
@@ -14,7 +14,7 @@
Name: waf
Version: 1.7.0
-Release: 0.1.%{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)
@@ -26,7 +26,7 @@ URL: http://code.google.com/p/waf/
# - /docs/book, as this is under CC-BY-NC-ND, which is not allowed in
# Fedora
# - Waf logos
-Source: waf-%{version}%{prerel}.stripped.tar.bz2
+Source: waf-%{version}%{?prerel}.stripped.tar.bz2
# use _datadir instead of /usr/lib
Patch0: waf-1.6.2-libdir.patch
Patch1: waf-1.6.9-logo.patch
@@ -209,6 +209,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Jun 7 2012 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.7.0-0.2.pre3
+- Spec file fixes.
+
* Thu Jun 7 2012 Michel Salim <salimma(a)fedoraproject.org> - 1.7.0-0.1.pre3
- Update to 1.7.0pre3
- Spec clean-up
https://src.fedoraproject.org/rpms/waf/c/a136f910622cb7da76b0381c3d32372e...
2Â years, 3Â months
thm pushed to waf (epel9). "Update to 1.7.0pre3 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:43 UTC
From 7286d02382b829db8fde526e8a81a70189ac9a58 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Jun 07 2012 07:08:09 +0000
Subject: Update to 1.7.0pre3
- Spec clean-up
- Rename -docs subpackage to -doc, per guidelines
---
diff --git a/.gitignore b/.gitignore
index df6b61b..f2de5eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/waf-1.6.11.stripped.tar.bz2
+/waf-1.7.0pre3.stripped.tar.bz2
diff --git a/repack.sh b/repack.sh
index 6170517..2d7ba3f 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,8 +1,9 @@
#! /bin/bash
-version=1.6.11
+version=1.7.0
+prerel=pre3
-src=waf-${version}.tar.bz2
+src=waf-${version}${prerel}.tar.bz2
dst=${src%.tar.bz2}.stripped.tar.bz2
rm -f ${dst} ${dst%.bz2}
@@ -12,7 +13,6 @@ bzip2 -d ${dst}
tar --delete --file=${dst%.bz2} \
waf-${version}/docs/book \
- waf-${version}/waflib/extras/subprocess.py \
waf-${version}/docs/sphinx/_images/waf-64x64.png \
waf-${version}/docs/gfx/waflogo.svg \
waf-${version}/docs/slides/presentation/gfx/waflogo.svg
diff --git a/sources b/sources
index 44b307e..b1acc8b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-87a22e5dd54e36e164fb2e44007b11b2 waf-1.6.11.stripped.tar.bz2
+07bbf9ac9848809999bd9036ebef601f waf-1.7.0pre3.stripped.tar.bz2
diff --git a/waf.spec b/waf.spec
index 028703f..2abe98c 100644
--- a/waf.spec
+++ b/waf.spec
@@ -9,9 +9,12 @@
# available)
%global with_docs 1
+# For pre-releases
+%global prerel pre3
+
Name: waf
-Version: 1.6.11
-Release: 1%{?dist}
+Version: 1.7.0
+Release: 0.1.%{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)
@@ -22,14 +25,14 @@ URL: http://code.google.com/p/waf/
# We remove:
# - /docs/book, as this is under CC-BY-NC-ND, which is not allowed in
# Fedora
-# - /waflib/extras/subprocess.py, is under a Python license and not
-# needed in Fedora
-Source: waf-%{version}.stripped.tar.bz2
+# - Waf logos
+Source: waf-%{version}%{prerel}.stripped.tar.bz2
# use _datadir instead of /usr/lib
Patch0: waf-1.6.2-libdir.patch
Patch1: waf-1.6.9-logo.patch
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
BuildArch: noarch
+
BuildRequires: python-devel
%if 0%{?with_python3}
BuildRequires: python3-devel
@@ -82,10 +85,16 @@ This package contains the Python 3 version of %{name}.
%if 0%{?with_docs}
-%package -n %{name}-docs
+%package -n %{name}-doc
Summary: Documentation for %{name}
-
-%description -n %{name}-docs
+Requires: %{name} = %{version}-%{release}
+# obsolete the previous docs subpackage - guideline specifies -doc
+# since: Fedora 18, RHEL 7 (mark the provides/obsoletes RHEL only after
+# we no longer need to provide upgrade paths from affected Fedora releases)
+Provides: %{name}-docs = %{version}-%{release}
+Obsoletes: %{name}-docs < 1.6.11-2
+
+%description -n %{name}-doc
Waf is a Python-based framework for configuring, compiling and
installing applications. It is a replacement for other tools such as
Autotools, Scons, CMake or Ant.
@@ -101,6 +110,9 @@ This package contains the HTML documentation for %{name}.
%build
+# ticgt trips up build, see
+# http://code.google.com/p/waf/issues/detail?id=1171
+mv waflib/extras/ticgt.py{,.off}
extras=
for f in waflib/extras/*.py ; do
f=$(basename "$f" .py);
@@ -122,8 +134,6 @@ popd
%install
-rm -rf %{buildroot}
-
# use waf so it unpacks itself
mkdir _temp ; pushd _temp
cp -av ../waf .
@@ -192,13 +202,18 @@ rm -rf %{buildroot}
%if 0%{?with_docs}
-%files -n %{name}-docs
+%files -n %{name}-doc
%defattr(-,root,root,-)
%doc docs/sphinx/build/html
%endif # with_docs
%changelog
+* Thu Jun 7 2012 Michel Salim <salimma(a)fedoraproject.org> - 1.7.0-0.1.pre3
+- Update to 1.7.0pre3
+- Spec clean-up
+- Rename -docs subpackage to -doc, per guidelines
+
* Mon Feb 6 2012 Michel Salim <salimma(a)fedoraproject.org> - 1.6.11-1
- Update to 1.6.11
- Build in verbose mode
https://src.fedoraproject.org/rpms/waf/c/7286d02382b829db8fde526e8a81a701...
2Â years, 3Â months
thm pushed to waf (epel9). "Update to 1.6.11 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:43 UTC
From 2317c43487ad81cd67842e2ccfd447cf5b9e4f28 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Feb 06 2012 12:26:36 +0000
Subject: Update to 1.6.11
- Build in verbose mode
---
diff --git a/.gitignore b/.gitignore
index 6a2167a..df6b61b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1 @@
-waf-1.5.18.stripped.tar.bz2
-/waf-1.5.19.stripped.tar.bz2
-/waf-1.6.2.stripped.tar.bz2
-/waf-1.6.3.stripped.tar.bz2
-/waf-1.6.4.stripped.tar.bz2
-/waf-1.6.6.stripped.tar.bz2
-/waf-1.6.8.stripped.tar.bz2
-/waf-1.6.9.stripped.tar.bz2
-/waf-1.6.10.stripped.tar.bz2
+/waf-1.6.11.stripped.tar.bz2
diff --git a/repack.sh b/repack.sh
index f32355c..6170517 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,6 +1,6 @@
#! /bin/bash
-version=1.6.10
+version=1.6.11
src=waf-${version}.tar.bz2
dst=${src%.tar.bz2}.stripped.tar.bz2
diff --git a/sources b/sources
index 5e44827..44b307e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7402024d472d80357bad08844d038a09 waf-1.6.10.stripped.tar.bz2
+87a22e5dd54e36e164fb2e44007b11b2 waf-1.6.11.stripped.tar.bz2
diff --git a/waf.spec b/waf.spec
index 6433060..028703f 100644
--- a/waf.spec
+++ b/waf.spec
@@ -10,8 +10,8 @@
%global with_docs 1
Name: waf
-Version: 1.6.10
-Release: 2%{?dist}
+Version: 1.6.11
+Release: 1%{?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)
@@ -116,7 +116,7 @@ pushd docs/sphinx
%if ! 0%{?fedora > 13}
export SPHINX_BUILD=sphinx-1.0-build
%endif
-../../waf configure build
+../../waf -v configure build
popd
%endif # with_docs
@@ -199,6 +199,10 @@ rm -rf %{buildroot}
%changelog
+* Mon Feb 6 2012 Michel Salim <salimma(a)fedoraproject.org> - 1.6.11-1
+- Update to 1.6.11
+- Build in verbose mode
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.6.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
https://src.fedoraproject.org/rpms/waf/c/2317c43487ad81cd67842e2ccfd447cf...
2Â years, 3Â months
thm pushed to waf (epel9). "Update to 1.6.10. (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:43 UTC
From 2f896fb09bae2d67e16c856b9223f7e3b0e5a903 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Dec 18 2011 12:09:53 +0000
Subject: Update to 1.6.10.
Remove patch applied upstream.
---
diff --git a/.gitignore b/.gitignore
index 3104011..6a2167a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ waf-1.5.18.stripped.tar.bz2
/waf-1.6.6.stripped.tar.bz2
/waf-1.6.8.stripped.tar.bz2
/waf-1.6.9.stripped.tar.bz2
+/waf-1.6.10.stripped.tar.bz2
diff --git a/repack.sh b/repack.sh
index 6fc086c..f32355c 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,6 +1,6 @@
#! /bin/bash
-version=1.6.9
+version=1.6.10
src=waf-${version}.tar.bz2
dst=${src%.tar.bz2}.stripped.tar.bz2
diff --git a/sources b/sources
index 432a0ad..5e44827 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7af2af06813a366eba6fabc76cee47e5 waf-1.6.9.stripped.tar.bz2
+7402024d472d80357bad08844d038a09 waf-1.6.10.stripped.tar.bz2
diff --git a/waf-1.6.8-syntax.patch b/waf-1.6.8-syntax.patch
deleted file mode 100644
index bde20e4..0000000
--- a/waf-1.6.8-syntax.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up waf-1.6.8/waflib/extras/qnxnto.py.orig waf-1.6.8/waflib/extras/qnxnto.py
---- waf-1.6.8/waflib/extras/qnxnto.py.orig 2011-10-01 19:06:38.000000000 +0200
-+++ waf-1.6.8/waflib/extras/qnxnto.py 2011-10-03 12:29:27.970114038 +0200
-@@ -34,7 +34,7 @@ class Popen(object):
- else:
- if Popen.verbose:
- print("Emulating")
-- except Exception, e:
-+ except Exception as e:
- if Popen.verbose:
- print("Exception: %s" % e)
- raise
diff --git a/waf.spec b/waf.spec
index 219e4fe..e552422 100644
--- a/waf.spec
+++ b/waf.spec
@@ -10,7 +10,7 @@
%global with_docs 1
Name: waf
-Version: 1.6.9
+Version: 1.6.10
Release: 1%{?dist}
Summary: A Python-based build system
Group: Development/Tools
@@ -27,8 +27,7 @@ URL: http://code.google.com/p/waf/
Source: waf-%{version}.stripped.tar.bz2
# use _datadir instead of /usr/lib
Patch0: waf-1.6.2-libdir.patch
-Patch1: waf-1.6.8-syntax.patch
-Patch2: waf-1.6.9-logo.patch
+Patch1: waf-1.6.9-logo.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
BuildRequires: python-devel
@@ -98,8 +97,7 @@ This package contains the HTML documentation for %{name}.
%prep
%setup -q
%patch0 -p0 -b .libdir
-%patch1 -p1 -b .syntax
-%patch2 -p1 -b .logo
+%patch1 -p1 -b .logo
%build
@@ -201,6 +199,10 @@ rm -rf %{buildroot}
%changelog
+* Sun Dec 18 2011 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.6.10-1
+- Update to 1.6.10.
+- Remove patch applied upstream.
+
* Sat Nov 26 2011 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.6.9-1
- Update to 1.6.9.
- Patch to not use the logo (which has been removed) in the docs.
https://src.fedoraproject.org/rpms/waf/c/2f896fb09bae2d67e16c856b9223f7e3...
2Â years, 3Â months
thm pushed to waf (epel9). "Remove unused patch."
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:43 UTC
From e5c50854729e33d1e0cd3bd98fe0d77ef25c4190 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Nov 26 2011 14:36:10 +0000
Subject: Remove unused patch.
---
diff --git a/waf-1.6.6-syntax.patch b/waf-1.6.6-syntax.patch
deleted file mode 100644
index 81ba5a2..0000000
--- a/waf-1.6.6-syntax.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: waflib/extras/review.py
-===================================================================
---- waflib/extras/review.py (revision 11401)
-+++ waflib/extras/review.py (revision 11402)
-@@ -47,7 +47,7 @@
-
- def __delitem__(self, key):
- if not key in self._keys:
-- raise KeyError, key
-+ raise KeyError(key)
- dict.__delitem__(self, key)
- self._keys.remove(key)
-
-Index: waflib/extras/md5_tstamp.py
-===================================================================
---- waflib/extras/md5_tstamp.py (revision 11401)
-+++ waflib/extras/md5_tstamp.py (revision 11402)
-@@ -33,7 +33,7 @@
- self.restore_real()
- try:
- Build.hash_cache = self.hash_cache or {}
-- except Exception, e:
-+ except Exception as e:
- Build.hash_cache = {}
- Build.BuildContext.restore_real = Build.BuildContext.restore
- Build.BuildContext.restore = restore
https://src.fedoraproject.org/rpms/waf/c/e5c50854729e33d1e0cd3bd98fe0d77e...
2Â years, 3Â months
thm pushed to waf (epel9). "Update to 1.6.9. (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:43 UTC
From 9f952ac49cc51a63fa5075e33381ae3b33de9e10 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Nov 26 2011 14:00:46 +0000
Subject: Update to 1.6.9.
Patch to not use the logo (which has been removed) in the docs.
---
diff --git a/.gitignore b/.gitignore
index 13e2821..3104011 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ waf-1.5.18.stripped.tar.bz2
/waf-1.6.4.stripped.tar.bz2
/waf-1.6.6.stripped.tar.bz2
/waf-1.6.8.stripped.tar.bz2
+/waf-1.6.9.stripped.tar.bz2
diff --git a/repack.sh b/repack.sh
index 694119a..6fc086c 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,6 +1,6 @@
#! /bin/bash
-version=1.6.8
+version=1.6.9
src=waf-${version}.tar.bz2
dst=${src%.tar.bz2}.stripped.tar.bz2
@@ -12,6 +12,9 @@ bzip2 -d ${dst}
tar --delete --file=${dst%.bz2} \
waf-${version}/docs/book \
- waf-${version}/waflib/extras/subprocess.py
+ waf-${version}/waflib/extras/subprocess.py \
+ waf-${version}/docs/sphinx/_images/waf-64x64.png \
+ waf-${version}/docs/gfx/waflogo.svg \
+ waf-${version}/docs/slides/presentation/gfx/waflogo.svg
bzip2 ${dst%.bz2}
diff --git a/sources b/sources
index b68777c..432a0ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a27fd4c936a2dc608ff203da9cce0742 waf-1.6.8.stripped.tar.bz2
+7af2af06813a366eba6fabc76cee47e5 waf-1.6.9.stripped.tar.bz2
diff --git a/waf-1.6.9-logo.patch b/waf-1.6.9-logo.patch
new file mode 100644
index 0000000..4dc73ed
--- /dev/null
+++ b/waf-1.6.9-logo.patch
@@ -0,0 +1,12 @@
+diff -up waf-1.6.9/docs/sphinx/conf.py.orig waf-1.6.9/docs/sphinx/conf.py
+--- waf-1.6.9/docs/sphinx/conf.py.orig 2011-11-20 15:51:43.000000000 +0100
++++ waf-1.6.9/docs/sphinx/conf.py 2011-11-26 14:27:33.996165116 +0100
+@@ -415,7 +415,7 @@ html_theme = 'default'
+
+ # The name of an image file (relative to this directory) to place at the top
+ # of the sidebar.
+-html_logo = '_images/waf-64x64.png'
++#html_logo = '_images/waf-64x64.png'
+
+ # The name of an image file (within the static path) to use as favicon of the
+ # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
diff --git a/waf.spec b/waf.spec
index f850a76..219e4fe 100644
--- a/waf.spec
+++ b/waf.spec
@@ -10,7 +10,7 @@
%global with_docs 1
Name: waf
-Version: 1.6.8
+Version: 1.6.9
Release: 1%{?dist}
Summary: A Python-based build system
Group: Development/Tools
@@ -28,6 +28,7 @@ Source: waf-%{version}.stripped.tar.bz2
# use _datadir instead of /usr/lib
Patch0: waf-1.6.2-libdir.patch
Patch1: waf-1.6.8-syntax.patch
+Patch2: waf-1.6.9-logo.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
BuildRequires: python-devel
@@ -98,6 +99,7 @@ This package contains the HTML documentation for %{name}.
%setup -q
%patch0 -p0 -b .libdir
%patch1 -p1 -b .syntax
+%patch2 -p1 -b .logo
%build
@@ -199,6 +201,10 @@ rm -rf %{buildroot}
%changelog
+* Sat Nov 26 2011 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.6.9-1
+- Update to 1.6.9.
+- Patch to not use the logo (which has been removed) in the docs.
+
* Mon Oct 3 2011 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.6.8-1
- Update to 1.6.8.
- Use rpm 4.9.X style provides/requires filtering.
https://src.fedoraproject.org/rpms/waf/c/9f952ac49cc51a63fa5075e33381ae3b...
2Â years, 3Â months
thm pushed to waf (epel9). "Update to 1.6.8. (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-02-22 08:33:43 UTC
From 7f3de811e903e54a0be60ecf1d7fa5604a4e468f Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm(a)fedoraproject.org>
Date: Oct 16 2011 12:49:21 +0000
Subject: Update to 1.6.8.
Use rpm 4.9.X style provides/requires filtering.
Move Python3 version to a subpackage.
Move HTML documentation to a subpackage.
---
diff --git a/.gitignore b/.gitignore
index 9c30c9e..13e2821 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ waf-1.5.18.stripped.tar.bz2
/waf-1.6.3.stripped.tar.bz2
/waf-1.6.4.stripped.tar.bz2
/waf-1.6.6.stripped.tar.bz2
+/waf-1.6.8.stripped.tar.bz2
diff --git a/repack.sh b/repack.sh
index 9d60179..694119a 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,6 +1,6 @@
#! /bin/bash
-version=1.6.6
+version=1.6.8
src=waf-${version}.tar.bz2
dst=${src%.tar.bz2}.stripped.tar.bz2
diff --git a/sources b/sources
index 959f892..b68777c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-70d0e550f91880c0f5ce72147c3688f3 waf-1.6.6.stripped.tar.bz2
+a27fd4c936a2dc608ff203da9cce0742 waf-1.6.8.stripped.tar.bz2
diff --git a/waf-1.6.8-syntax.patch b/waf-1.6.8-syntax.patch
new file mode 100644
index 0000000..bde20e4
--- /dev/null
+++ b/waf-1.6.8-syntax.patch
@@ -0,0 +1,12 @@
+diff -up waf-1.6.8/waflib/extras/qnxnto.py.orig waf-1.6.8/waflib/extras/qnxnto.py
+--- waf-1.6.8/waflib/extras/qnxnto.py.orig 2011-10-01 19:06:38.000000000 +0200
++++ waf-1.6.8/waflib/extras/qnxnto.py 2011-10-03 12:29:27.970114038 +0200
+@@ -34,7 +34,7 @@ class Popen(object):
+ else:
+ if Popen.verbose:
+ print("Emulating")
+- except Exception, e:
++ except Exception as e:
+ if Popen.verbose:
+ print("Exception: %s" % e)
+ raise
diff --git a/waf.spec b/waf.spec
index 4e11da9..f850a76 100644
--- a/waf.spec
+++ b/waf.spec
@@ -2,6 +2,7 @@
%global with_python3 1
# Turn off the brp-python-bytecompile script
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
+%{!?python3_version: %global python3_version %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3])")}
%endif
# Enable building without html docs (e.g. in case no recent sphinx is
@@ -9,7 +10,7 @@
%global with_docs 1
Name: waf
-Version: 1.6.6
+Version: 1.6.8
Release: 1%{?dist}
Summary: A Python-based build system
Group: Development/Tools
@@ -26,8 +27,7 @@ URL: http://code.google.com/p/waf/
Source: waf-%{version}.stripped.tar.bz2
# use _datadir instead of /usr/lib
Patch0: waf-1.6.2-libdir.patch
-# upstream r11402
-Patch1: waf-1.6.6-syntax.patch
+Patch1: waf-1.6.8-syntax.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
BuildRequires: python-devel
@@ -43,13 +43,18 @@ BuildRequires: python-sphinx10
BuildRequires: graphviz
BuildRequires: ImageMagick
%endif # with_docs
+%if "%{?python_version}" != ""
# Seems like automatic ABI dependency is not detected since the files are
# going to a non-standard location
-Requires: python(abi) %(%{__python} -c "import sys ; print \"=\", sys.version[:3]")
+Requires: python(abi) = %{python_version}
+%endif
# the demo suite contains a perl module, which draws in unwanted
# provides and requires
+%global __requires_exclude_from %{_docdir}
+%global __provides_exclude_from %{_docdir}
+# for EPEL, we need the old filters
%global __perl_provides %{nil}
%global __perl_requires %{nil}
@@ -60,10 +65,39 @@ installing applications. It is a replacement for other tools such as
Autotools, Scons, CMake or Ant.
+%if 0%{?with_python3}
+%package -n %{name}-python3
+Summary: Python3 support for %{name}
+%if "%{?python3_version}" != ""
+Requires: python(abi) = %{python3_version}
+%endif
+
+%description -n %{name}-python3
+Waf is a Python-based framework for configuring, compiling and
+installing applications. It is a replacement for other tools such as
+Autotools, Scons, CMake or Ant.
+
+This package contains the Python 3 version of %{name}.
+%endif # with_python3
+
+
+%if 0%{?with_docs}
+%package -n %{name}-docs
+Summary: Documentation for %{name}
+
+%description -n %{name}-docs
+Waf is a Python-based framework for configuring, compiling and
+installing applications. It is a replacement for other tools such as
+Autotools, Scons, CMake or Ant.
+
+This package contains the HTML documentation for %{name}.
+%endif # with_docs
+
+
%prep
%setup -q
%patch0 -p0 -b .libdir
-%patch1 -p0
+%patch1 -p1 -b .syntax
%build
@@ -106,17 +140,26 @@ find . -name '*.py' -printf '%%P\0' |
popd
%endif # with_python3
popd
-install -m 0755 -p -D waf-light %{buildroot}%{_bindir}/waf
+
+# install the frontend
+install -m 0755 -p -D waf-light %{buildroot}%{_bindir}/waf-%{python_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
# 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#! /usr/bin/python" %{buildroot}%{_bindir}/waf
+sed -i "1c#! %{__python}" %{buildroot}%{_bindir}/waf-%{python_version}
+%if 0%{?with_python3}
+sed -i "1c#! %{__python3}" %{buildroot}%{_bindir}/waf-%{python3_version}
+%endif # with_python3
# remove x-bits from everything going to doc
-find demos utils -type f -exec %{__chmod} 0644 {} \;
+find demos utils -type f -exec chmod 0644 {} \;
# remove hidden file
rm -f docs/sphinx/build/html/.buildinfo
@@ -135,17 +178,33 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc README TODO ChangeLog demos
-%if 0%{?with_docs}
-%doc docs/sphinx/build/html
-%endif # with_docs
%{_bindir}/waf
+%{_bindir}/waf-%{python_version}
%{_datadir}/waf
+
+
%if 0%{?with_python3}
+%files -n %{name}-python3
+%defattr(-,root,root,-)
+%{_bindir}/waf-%{python3_version}
%{_datadir}/waf3
%endif # with_python3
+%if 0%{?with_docs}
+%files -n %{name}-docs
+%defattr(-,root,root,-)
+%doc docs/sphinx/build/html
+%endif # with_docs
+
+
%changelog
+* Mon Oct 3 2011 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.6.8-1
+- Update to 1.6.8.
+- Use rpm 4.9.X style provides/requires filtering.
+- Move Python3 version to a subpackage.
+- Move HTML documentation to a subpackage.
+
* Sat Jun 18 2011 Thomas Moschny <thomas.moschny(a)gmx.de> - 1.6.6-1
- Update to 1.6.6.
- Remove unused extras/subprocess.py.
https://src.fedoraproject.org/rpms/waf/c/7f3de811e903e54a0be60ecf1d7fa560...
2Â years, 3Â months