From 4c62862c8d3438327dd626ccc55d792fde94d631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Wed, 13 Apr 2022 08:26:45 +0200 Subject: [PATCH] Update to 14.0.0 Resolves: rhbz#2061041 --- .gitignore | 1 + python-lit.spec | 66 +++++++------------------------------------------ sources | 2 +- 3 files changed, 11 insertions(+), 58 deletions(-) diff --git a/.gitignore b/.gitignore index 5267424..9045a0a 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /lit-12.0.1.tar.gz /lit-13.0.0.tar.gz /lit-13.0.1.tar.gz +/lit-14.0.0.tar.gz diff --git a/python-lit.spec b/python-lit.spec index 4a93480..adb6c4e 100644 --- a/python-lit.spec +++ b/python-lit.spec @@ -1,22 +1,10 @@ -%global srcname lit - -%if 0%{?fedora} || 0%{?rhel} > 7 -%global with_python2 0 -%else -%global with_python2 1 -%endif - -%global lit_version 13.0.1 +%global lit_version 14.0.0 #global rc_ver 1 #%%global post_ver 1 %bcond_without check -# FIXME: Work around for rhel not having py2_build/py2_install macro. -%{!?py2_build: %global py2_build %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} build --executable="%{__python2} -s"}} -%{!?py2_install: %global py2_install %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} install -O1 --skip-build --root %{buildroot}}} - -Name: python-%{srcname} +Name: python-lit Version: %{lit_version}%{?rc_ver:~rc%{rc_ver}} Release: 1%{?dist} BuildArch: noarch @@ -24,19 +12,14 @@ BuildArch: noarch License: NCSA Summary: Tool for executing llvm test suites URL: https://pypi.python.org/pypi/lit -Source0: %{pypi_source %{srcname} %{lit_version}%{?rc_ver:rc%{rc_ver}}%{?post_ver:.post%{post_ver}}} +Source0: %{pypi_source lit %{lit_version}%{?rc_ver:rc%{rc_ver}}%{?post_ver:.post%{post_ver}}} # for file check %if %{with check} BuildRequires: llvm-test %endif - BuildRequires: python3-devel BuildRequires: python3-setuptools -%if 0%{?with_python2} -BuildRequires: python2-devel -BuildRequires: python2-setuptools -%endif %description lit is a tool used by the LLVM project for executing its test suites. @@ -46,67 +29,36 @@ Summary: LLVM lit test runner for Python 3 Requires: python3-setuptools -%if 0%{?with_python2} -%package -n python2-lit -Summary: LLVM lit test runner for Python 2 - -Requires: python2-setuptools -%endif - %description -n python3-lit lit is a tool used by the LLVM project for executing its test suites. -%if 0%{?with_python2} -%description -n python2-lit -lit is a tool used by the LLVM project for executing its test suites. -%endif - %prep -%autosetup -n %{srcname}-%{lit_version}%{?rc_ver:rc%{rc_ver}}%{?post_ver:.post%{post_ver}} -p4 +%autosetup -n lit-%{lit_version}%{?rc_ver:rc%{rc_ver}}%{?post_ver:.post%{post_ver}} -p4 %build %py3_build -%if 0%{?with_python2} -%py2_build -%endif %install %py3_install -%if 0%{?with_python2} -%py2_install -%endif # Strip out #!/usr/bin/env python -sed -i -e '1{\@^#!/usr/bin/env python@d}' %{buildroot}%{python3_sitelib}/%{srcname}/*.py -%if 0%{?with_python2} -sed -i -e '1{\@^#!/usr/bin/env python@d}' %{buildroot}%{python2_sitelib}/%{srcname}/*.py -%endif +sed -i -e '1{\@^#!/usr/bin/env python@d}' %{buildroot}%{python3_sitelib}/lit/*.py %if %{with check} %check %{__python3} lit.py tests -%if 0%{?with_python2} -%{__python2} lit.py tests -%endif %endif -%files -n python3-%{srcname} +%files -n python3-lit %license LICENSE.TXT %doc README.txt %{python3_sitelib}/* %{_bindir}/lit -%if 0%{?with_python2} -%files -n python2-%{srcname} -%license LICENSE.TXT -%doc README.txt -%{python2_sitelib}/* -%if %{undefined with_python2} -%{_bindir}/lit -%endif -%endif - %changelog +* Wed Apr 13 2022 Timm Bäder - 14.0.0-1 +- Update to 14.0.0 + * Wed Feb 02 2022 Tom Stellard - 13.0.1-1 - 13.0.1 Release diff --git a/sources b/sources index 38908e2..883ebc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lit-13.0.1.tar.gz) = 0df0715482fe2ba5b6f837f677ae5d6c23a52f67c1754d0d33dd2947c1482d88db47539590f2ea596b6bc05220ef2928da31fcfecf10593fb6bd973165550248 +SHA512 (lit-14.0.0.tar.gz) = 0732b9b6bd6afb4b0994c699cd8edbb1201d557aa73cd83e0c980e04981c27d63adda8c03bc6c4732e66d9acbf0d26fdf91db8565fc6313808a3fadcc30f7fdc