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 - 1.9.14-2 +- Spec file cleanups. * Sat Jul 14 2018 Fedora Release Engineering - 1.9.14-1.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild