Compare commits
10 Commits
f48f212adc
...
c15f69361f
Author | SHA1 | Date | |
---|---|---|---|
|
c15f69361f | ||
|
6722bafeee | ||
|
466781fc37 | ||
|
2d27f76ec0 | ||
|
0cc08d4a83 | ||
|
178f84a306 | ||
|
94ddd18904 | ||
|
b6e57fe35d | ||
|
214a1600ef | ||
|
2ddbc9a144 |
1
.rpmlint.metadata
Normal file
1
.rpmlint.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
473ddaabbe28a2f5836116d4b19e4a9b641fd038 rpmlint-1.11.tar.gz
|
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-9
|
||||||
|
decision_context: osci_compose_gate
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-gating.functional}
|
23
rpmlint-1.11-disable-flake8-self-test.patch
Normal file
23
rpmlint-1.11-disable-flake8-self-test.patch
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
diff -up rpmlint-rpmlint-1.11/test.sh.orig rpmlint-rpmlint-1.11/test.sh
|
||||||
|
--- rpmlint-rpmlint-1.11/test.sh.orig 2022-01-12 17:23:52.565790275 +0100
|
||||||
|
+++ rpmlint-rpmlint-1.11/test.sh 2022-01-12 17:24:02.043920708 +0100
|
||||||
|
@@ -2,7 +2,7 @@
|
||||||
|
|
||||||
|
export PYTHONPATH=$(pwd)/tools:$(pwd)
|
||||||
|
export TESTPATH="$(pwd)/test/"
|
||||||
|
-: ${PYTHON:=python} ${PYTEST:=py.test} ${FLAKE8:=flake8}
|
||||||
|
+: ${PYTHON:=python} ${PYTEST:=py.test}
|
||||||
|
: ${PYTHONWARNINGS:=all}
|
||||||
|
export PYTHONWARNINGS
|
||||||
|
|
||||||
|
@@ -40,10 +40,6 @@ $PYTEST -v || exit $?
|
||||||
|
|
||||||
|
unset PYTHONWARNINGS
|
||||||
|
|
||||||
|
-echo "$FLAKE8 tests"
|
||||||
|
-$FLAKE8 --version
|
||||||
|
-$FLAKE8 . ./rpmdiff ./rpmlint || exit $?
|
||||||
|
-
|
||||||
|
echo "man page tests"
|
||||||
|
if man --help 2>&1 | grep -q -- --warnings; then
|
||||||
|
tmpfile=$(mktemp) || exit 1
|
13
rpmlint-1.11-spellcheck-handle-missing-language-error.patch
Normal file
13
rpmlint-1.11-spellcheck-handle-missing-language-error.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff -up rpmlint-rpmlint-1.11/TagsCheck.py.orig rpmlint-rpmlint-1.11/TagsCheck.py
|
||||||
|
--- rpmlint-rpmlint-1.11/TagsCheck.py.orig 2022-01-11 16:49:18.424026182 +0100
|
||||||
|
+++ rpmlint-rpmlint-1.11/TagsCheck.py 2022-01-11 16:50:05.774665734 +0100
|
||||||
|
@@ -463,7 +463,8 @@ def spell_check(pkg, str, fmt, lang, ign
|
||||||
|
lang, filters=[enchant.tokenize.EmailFilter,
|
||||||
|
enchant.tokenize.URLFilter,
|
||||||
|
enchant.tokenize.WikiWordFilter])
|
||||||
|
- except enchant.DictNotFoundError:
|
||||||
|
+ except (enchant.errors.DefaultLanguageNotFoundError,
|
||||||
|
+ enchant.DictNotFoundError):
|
||||||
|
printInfo(pkg, 'enchant-dictionary-not-found', lang)
|
||||||
|
pass
|
||||||
|
_enchant_checkers[lang] = checker
|
@ -461,6 +461,8 @@ addFilter("info-files-without-install-info-postun")
|
|||||||
addFilter("postin-without-install-info")
|
addFilter("postin-without-install-info")
|
||||||
# pip 20.2 generates PEP 376 "REQUESTED" marker (empty)
|
# pip 20.2 generates PEP 376 "REQUESTED" marker (empty)
|
||||||
addFilter(r"zero-length .+/site-packages/.+\.dist-info/REQUESTED\b")
|
addFilter(r"zero-length .+/site-packages/.+\.dist-info/REQUESTED\b")
|
||||||
|
# py.typed files are empty
|
||||||
|
addFilter(r"zero-length .+/site-packages/.+/py\.typed\b")
|
||||||
|
|
||||||
bad_crypto_warning = \
|
bad_crypto_warning = \
|
||||||
'''This application package calls a function to explicitly set crypto ciphers
|
'''This application package calls a function to explicitly set crypto ciphers
|
||||||
|
54
rpmlint.spec
54
rpmlint.spec
@ -15,12 +15,9 @@
|
|||||||
%global pytest py.test
|
%global pytest py.test
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# linitng is flaky, so we fake it
|
|
||||||
%global flake8 true
|
|
||||||
|
|
||||||
Name: rpmlint
|
Name: rpmlint
|
||||||
Version: 1.11
|
Version: 1.11
|
||||||
Release: 12%{?dist}
|
Release: 19%{?dist}
|
||||||
Summary: Tool for checking common errors in RPM packages
|
Summary: Tool for checking common errors in RPM packages
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: https://github.com/rpm-software-management/rpmlint
|
URL: https://github.com/rpm-software-management/rpmlint
|
||||||
@ -40,27 +37,27 @@ Patch213: rpmlint-1.11-libc-warnings.patch
|
|||||||
# See https://fedoraproject.org/wiki/Changes/PythonMacroError
|
# See https://fedoraproject.org/wiki/Changes/PythonMacroError
|
||||||
Patch214: rpmlint-1.11-no-python-macro.patch
|
Patch214: rpmlint-1.11-no-python-macro.patch
|
||||||
|
|
||||||
|
# Downstream-only patches
|
||||||
|
Patch215: rpmlint-1.11-spellcheck-handle-missing-language-error.patch
|
||||||
|
Patch216: rpmlint-1.11-disable-flake8-self-test.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
BuildRequires: make
|
||||||
%if %{with python3}
|
%if %{with python3}
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
BuildRequires: python3-rpm >= 4.4.2.2
|
BuildRequires: python3-rpm >= 4.4.2.2
|
||||||
BuildRequires: python3-pytest
|
BuildRequires: python3-pytest
|
||||||
#BuildRequires: python3-flake8-import-order
|
|
||||||
Requires: python3
|
Requires: python3
|
||||||
Requires: python3-rpm >= 4.4.2.2
|
Requires: python3-rpm >= 4.4.2.2
|
||||||
%else
|
%else
|
||||||
BuildRequires: python >= 2.6
|
BuildRequires: python >= 2.6
|
||||||
BuildRequires: rpm-python >= 4.4.2.2
|
BuildRequires: rpm-python >= 4.4.2.2
|
||||||
BuildRequires: pytest
|
BuildRequires: pytest
|
||||||
#BuildRequires: python2-flake8-import-order
|
|
||||||
Requires: python >= 2.6
|
Requires: python >= 2.6
|
||||||
Requires: rpm-python >= 4.4.2.2
|
Requires: rpm-python >= 4.4.2.2
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: sed >= 3.95
|
BuildRequires: sed >= 3.95
|
||||||
%if ! 0%{?rhel}
|
|
||||||
# no bash-completion for RHEL
|
|
||||||
BuildRequires: bash-completion
|
BuildRequires: bash-completion
|
||||||
%endif
|
|
||||||
# python-magic and python-enchant are actually optional dependencies, but
|
# python-magic and python-enchant are actually optional dependencies, but
|
||||||
# they bring quite desirable features.
|
# they bring quite desirable features.
|
||||||
%if %{with python3}
|
%if %{with python3}
|
||||||
@ -105,6 +102,10 @@ and source packages as well as spec files can be checked.
|
|||||||
%patch212 -p1
|
%patch212 -p1
|
||||||
%patch213 -p1
|
%patch213 -p1
|
||||||
%patch214 -p1
|
%patch214 -p1
|
||||||
|
%patch215 -p1
|
||||||
|
%patch216 -p1
|
||||||
|
|
||||||
|
sed -i 's|1.10|%{version}|g' Makefile
|
||||||
|
|
||||||
%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9
|
%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9
|
||||||
# TODO, take upstream (RPM 4.15 related)
|
# TODO, take upstream (RPM 4.15 related)
|
||||||
@ -127,9 +128,7 @@ make install DESTDIR=$RPM_BUILD_ROOT ETCDIR=%{_sysconfdir} MANDIR=%{_mandir} \
|
|||||||
LIBDIR=%{_datadir}/rpmlint BINDIR=%{_bindir} PYTHON=%{python}
|
LIBDIR=%{_datadir}/rpmlint BINDIR=%{_bindir} PYTHON=%{python}
|
||||||
install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config
|
install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config
|
||||||
|
|
||||||
%if 0%{?rhel}
|
|
||||||
rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/
|
rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
@ -141,20 +140,14 @@ sed -i 's/test_pyc_m/xxx_pyc_m/' test/test_files.py
|
|||||||
sed -i 's/test_inconsistent_file_extension/xxx_inconsistent_file_extension/' test/test_sources.py
|
sed -i 's/test_inconsistent_file_extension/xxx_inconsistent_file_extension/' test/test_sources.py
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
make check PYTHON=%{python} PYTEST=%{pytest} FLAKE8=%{flake8}
|
make check PYTHON=%{python} PYTEST=%{pytest}
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%doc README.md config.example
|
%doc README.md config.example
|
||||||
%config(noreplace) %{_sysconfdir}/rpmlint/
|
%config(noreplace) %{_sysconfdir}/rpmlint/
|
||||||
%if 0%{?fedora}
|
%{_datadir}/bash-completion/completions/
|
||||||
%{_datadir}/bash-completion/
|
|
||||||
%else
|
|
||||||
%if ! 0%{?rhel}
|
|
||||||
%{_sysconfdir}/bash_completion.d/
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
%{_bindir}/rpmdiff
|
%{_bindir}/rpmdiff
|
||||||
%{_bindir}/rpmlint
|
%{_bindir}/rpmlint
|
||||||
%{_datadir}/rpmlint/
|
%{_datadir}/rpmlint/
|
||||||
@ -162,6 +155,29 @@ make check PYTHON=%{python} PYTEST=%{pytest} FLAKE8=%{flake8}
|
|||||||
%{_mandir}/man1/rpmlint.1*
|
%{_mandir}/man1/rpmlint.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jan 12 2022 Michal Domonkos <mdomonko@redhat.com> - 1.11-19
|
||||||
|
- Disable flake8 self-test (#1929210)
|
||||||
|
|
||||||
|
* Mon Jan 10 2022 Michal Domonkos <mdomonko@redhat.com> - 1.11-18
|
||||||
|
- Enable bash-completion (#1999654)
|
||||||
|
- Handle missing language error during spellcheck (#1929210)
|
||||||
|
|
||||||
|
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.11-17
|
||||||
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.11-16
|
||||||
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
|
* Fri Feb 5 2021 Tom Callaway <spot@fedoraproject.org> - 1.11-15
|
||||||
|
- correct hard-coded version in Makefile
|
||||||
|
|
||||||
|
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-14
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jan 25 2021 Miro Hrončok <mhroncok@redhat.com> - 1.11-13
|
||||||
|
- Filter out empty py.typed files in Python site-packages
|
||||||
|
|
||||||
* Fri Aug 21 2020 Miro Hrončok <mhroncok@redhat.com> - 1.11-12
|
* Fri Aug 21 2020 Miro Hrončok <mhroncok@redhat.com> - 1.11-12
|
||||||
- Filter out empty REQUESTED files in pip installed Python metadata dist-info dirs
|
- Filter out empty REQUESTED files in pip installed Python metadata dist-info dirs
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user