diff --git a/.gitignore b/.gitignore index ffcea24..5dce6a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/lit-0.10.0.tar.gz +SOURCES/lit-0.11.0rc1.tar.gz diff --git a/.python-lit.metadata b/.python-lit.metadata index 908fb17..8f1df28 100644 --- a/.python-lit.metadata +++ b/.python-lit.metadata @@ -1 +1 @@ -b1c31b0e5bc1d6c9dc4969362caf91dbfaed23c4 SOURCES/lit-0.10.0.tar.gz +81fdd584b1ff3624d8b4879c2a7d6254dd1372a0 SOURCES/lit-0.11.0rc1.tar.gz diff --git a/SOURCES/version.patch b/SOURCES/version.patch deleted file mode 100644 index 179c004..0000000 --- a/SOURCES/version.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/llvm/utils/lit/lit/cl_arguments.py b/llvm/utils/lit/lit/cl_arguments.py -index bac2be2..402fadb 100644 ---- a/llvm/utils/lit/lit/cl_arguments.py -+++ b/llvm/utils/lit/lit/cl_arguments.py -@@ -15,7 +15,9 @@ def parse_args(): - parser.add_argument("--version", - dest="show_version", - help="Show version and exit", -- action="store_true") -+ version="lit " + lit.__version__, -+ action="version") -+ - parser.add_argument("-j", "--threads", "--workers", - dest="workers", - metavar="N", -diff --git a/llvm/utils/lit/lit/main.py b/llvm/utils/lit/lit/main.py -index c58b06c..0f0c76b 100755 ---- a/llvm/utils/lit/lit/main.py -+++ b/llvm/utils/lit/lit/main.py -@@ -21,10 +21,6 @@ import lit.util - def main(builtin_params={}): - opts = lit.cl_arguments.parse_args() - -- if opts.show_version: -- print("lit %s" % lit.__version__) -- return -- - params = create_params(builtin_params, opts.user_params) - is_windows = platform.system() == 'Windows' - -diff --git a/llvm/utils/lit/tests/version.py b/llvm/utils/lit/tests/version.py -new file mode 100644 -index 0000000..6d1d0fc ---- /dev/null -+++ b/llvm/utils/lit/tests/version.py -@@ -0,0 +1,5 @@ -+# Basic sanity check that --version works. -+# -+# RUN: %{lit} --version | FileCheck %s -+# -+# CHECK: lit {{[0-9]+\.[0-9]+\.[0-9]+[a-zA-Z0-9]*}} - diff --git a/SPECS/python-lit.spec b/SPECS/python-lit.spec index 1aa70f9..c47597f 100644 --- a/SPECS/python-lit.spec +++ b/SPECS/python-lit.spec @@ -6,8 +6,8 @@ %global with_python2 1 %endif -#%%global rc_ver 1 -%global baserelease 1 +%global rc_ver 1 +%global baserelease 0.1 %bcond_without check @@ -16,16 +16,14 @@ %{!?py2_install: %global py2_install %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} install -O1 --skip-build --root %{buildroot}}} Name: python-%{srcname} -Version: 0.10.0 +Version: 0.11.0 Release: %{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist} BuildArch: noarch License: NCSA Summary: Tool for executing llvm test suites URL: https://pypi.python.org/pypi/lit -Source0: https://files.pythonhosted.org/packages/e7/56/7967ff7ea510c12a4f3d5f6582a416ff74bd6b1194be265c979df6701c56/lit-0.10.0.tar.gz - -Patch0: version.patch +Source0: https://files.pythonhosted.org/packages/be/39/44e2e9c977a4beb2d60566736b78bbbd7d194034a89f409fb867e48bd167/lit-0.11.0rc1.tar.gz # for file check %if %{with check} @@ -106,6 +104,9 @@ sed -i -e '1{\@^#!/usr/bin/env python@d}' %{buildroot}%{python2_sitelib}/%{srcna %endif %changelog +* Thu Sep 17 2020 sguelton@redhat.com - 0.11.0-0.1.rc1 +- 0.11.0 rc1 Release + * Thu Apr 9 2020 sguelton@redhat.com - 0.10.0-1 - 0.10.0 final release