From cf69480a57992e97d1513fd423ac57a0b50f5e45 Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Feb 13 2020 20:45:08 +0000 Subject: 10.0.0rc1 release --- diff --git a/.gitignore b/.gitignore index 2ee9c2b..d176371 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /lit-0.8.0.tar.gz /lit-0.9.0rc4.tar.gz /lit-0.9.0.tar.gz +/lit-0.10.0rc1.tar.gz diff --git a/python-lit.spec b/python-lit.spec index 8bc549a..806773d 100644 --- a/python-lit.spec +++ b/python-lit.spec @@ -6,7 +6,7 @@ %global with_python2 1 %endif -#%%global rc_ver 4 +%global rc_ver 1 %bcond_without check # FIXME: Work around for rhel not having py2_build/py2_install macro. @@ -14,14 +14,16 @@ %{!?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.9.0 -Release: 4%{?dist} +Version: 0.10.0 +Release: 0.1%{?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/11/96/79e3eb8508926bc47f8be4a371a310453beaa1eb8e6c94140d45c8029adf/lit-0.9.0.tar.gz +Source0: https://files.pythonhosted.org/packages/31/55/d69460169307b71f610977841ded96857147048c0764dd6369dde3ee11c1/lit-0.10.0rc1.tar.gz + +Patch0: version.patch # for file check %if %{with check} @@ -59,7 +61,7 @@ lit is a tool used by the LLVM project for executing its test suites. %endif %prep -%autosetup -n %{srcname}-%{version}%{?rc_ver:rc%{rc_ver}} +%autosetup -n %{srcname}-%{version}%{?rc_ver:rc%{rc_ver}} -p4 %build %py3_build @@ -102,6 +104,9 @@ sed -i -e '1{\@^#!/usr/bin/env python@d}' %{buildroot}%{python2_sitelib}/%{srcna %endif %changelog +* Tue Feb 11 2020 sguelton@redhat.com - 0.10.0-0.1.rc1 +- 0.10.0 rc1 Release + * Thu Jan 30 2020 Fedora Release Engineering - 0.9.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index ca2fad2..5871562 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lit-0.9.0.tar.gz) = 675bb09b56183d40e43dc99694c1a6c8160a522780c7e7b6b30c6f458cbe7304e7a86a37d20d3ecc0ba0f318c64dd146ee7331ec3553a71452ac6a9e777d7108 +SHA512 (lit-0.10.0rc1.tar.gz) = c79f0626b148b980c7d8570613f84382ae41d8d8599a295447570a38f0e50ce625b2443a72b9c34301616e92a2d9eb77f6392456e09260b297bbf01d484583fb diff --git a/version.patch b/version.patch new file mode 100644 index 0000000..179c004 --- /dev/null +++ b/version.patch @@ -0,0 +1,42 @@ +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]*}} +