From 0237298b3d2ffd88ea11661f03aca662ec1b1697 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 16:26:47 +0100 Subject: [PATCH] fix cross-obsolete in -py3 and -py310 subpackages; remove python-pylint-tools subpackage in favour of renamed binaries [release 2.14.5-3mamba;Tue Apr 11 2023] --- python-pylint.spec | 51 ++++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/python-pylint.spec b/python-pylint.spec index e4f2ca3..f75ffb1 100644 --- a/python-pylint.spec +++ b/python-pylint.spec @@ -1,6 +1,6 @@ Name: python-pylint Version: 2.14.5 -Release: 2mamba +Release: 3mamba Summary: Python code static checker Group: Development/Libraries/Python Vendor: openmamba @@ -27,27 +27,17 @@ Pylint is a python tool that checks if a module satisfies a coding standard. Pylint is similar to PyChecker but offers more features, like checking line-code's length, checking if variable names are well-formed according to your coding standard, or checking if declared interfaces are truly implemented, and much more (see the complete check list). The big advantage with Pylint is that it is highly configurable, customizable, and you can easily write a small plugin to add a personal feature. -%package tools -Summary: Command line tools provided with Pylint -Group: Graphical Desktop/Applications/Development -#Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} -#Requires: python-tk -Obsoletes: pylint-gui < 2.6.0 -Obsoletes: pylint-tools < 2.12.2-2mamba - -%description tools -Pylint is a python tool that checks if a module satisfies a coding standard. -Pylint is similar to PyChecker but offers more features, like checking line-code's length, checking if variable names are well-formed according to your coding standard, or checking if declared interfaces are truly implemented, and much more (see the complete check list). -The big advantage with Pylint is that it is highly configurable, customizable, and you can easily write a small plugin to add a personal feature. -This package provides the command line tools provided with Pylint. - %if "%{?with_pyver}" +%if "%{?with_pyver}" == "3" %define py_requires_append \ -Requires: python-pylint-tools = %{?epoch:%epoch:}%{version}-%{release} \ +Obsoletes: python-pylint-tools <= 2.14.5-2mamba \ +Obsoletes: pylint-tools < 2.12.2-2mamba \ +Obsoletes: pylint-gui < 2.6.0 \ Provides: pylint \ Obsoletes: pylint < 2.6.0 \ Provides: pylint-py3 \ Obsoletes: pylint-py3 < 2.12.2-2mamba +%endif %pyver_package %endif @@ -72,33 +62,32 @@ rm -rf %{buildroot}%{python_sitelib}/pylint/test sed -i "\,\.egg-info/,d;s,.*/man/.*,&.gz,;\,/test/,d" %{name}.filelist -#install -d -m 0755 %{buildroot}%{_mandir}/man1 -#install -m 0644 man/*.1 %{buildroot}%{_mandir}/man1/ - -## Fix encoding in readme and other documentation files -#for f in README doc/*.txt; do -# iconv -f iso-8859-15 -t utf-8 $f > $f.utf8 -# mv -f $f.utf8 $f -#done +%if "%{?with_pyver}" != "3" +# Rename any conflicting file outside of python site packages tree +for f in %{_bindir}/{epylint,pylint,pyreverse,symilar}; do + mv %{buildroot}${f}{,-%{?pyappend}} +done +sed -i "\,%{_bindir},d" %{name}.filelist +%endif %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %files %{?pyappend} -f %{name}.filelist %defattr(-,root,root) +%{_bindir}/epylint* +%{_bindir}/pylint* +%{_bindir}/pyreverse* +%{_bindir}/symilar* %dir %{python_sitearch}/pylint-%{version}-py*.egg-info %{python_sitearch}/pylint-%{version}-py*.egg-info/* %exclude %{_bindir} %doc LICENSE -%files tools -%defattr(-,root,root,-) -%{_bindir}/epylint -%{_bindir}/pylint -%{_bindir}/pyreverse -%{_bindir}/symilar - %changelog +* Tue Apr 11 2023 Silvan Calarco 2.14.5-3mamba +- fix cross-obsolete in -py3 and -py310 subpackages; remove python-pylint-tools subpackage in favour of renamed binaries + * Fri Apr 07 2023 Sdk Build System 2.14.5-2mamba - rebuilt with python 3.10