Apply upstream fix for Python 3.7 new magic numbers
This commit is contained in:
parent
0e4c3a2139
commit
b7d6ab3005
13
rpmlint-1.10-py37magic.patch
Normal file
13
rpmlint-1.10-py37magic.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/FilesCheck.py b/FilesCheck.py
|
||||
index c8666b9..78b22ef 100644
|
||||
--- a/FilesCheck.py
|
||||
+++ b/FilesCheck.py
|
||||
@@ -331,7 +331,7 @@ def peek(filename, pkg, length=1024):
|
||||
'3.4': [3310],
|
||||
'3.5': [3350, 3351], # 3350 for < 3.5.2
|
||||
'3.6': [3379],
|
||||
- '3.7': [3390],
|
||||
+ '3.7': [3390, 3391, 3392, 3393, 3394],
|
||||
}
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
Name: rpmlint
|
||||
Version: 1.10
|
||||
Release: 13%{?dist}
|
||||
Release: 14%{?dist}
|
||||
Summary: Tool for checking common errors in RPM packages
|
||||
Group: Development/Tools
|
||||
License: GPLv2
|
||||
@ -42,6 +42,9 @@ Patch1: rpmlint-1.10-flake-cleanups.patch
|
||||
Patch2: rpmlint-1.10-missing-files-exception.patch
|
||||
# https://github.com/rpm-software-management/rpmlint/commit/e52dcc73bab5c4310e9bb773e6aedea020e340ff
|
||||
Patch3: rpmlint-1.10-py37mtime.patch
|
||||
# https://github.com/rpm-software-management/rpmlint/commit/52b715763217bbc1cfcad9bba8e6a446e820690e
|
||||
# https://github.com/rpm-software-management/rpmlint/commit/78e073e2a5a09bbd8206b52578fd29bd53ff1065
|
||||
Patch4: rpmlint-1.10-py37magic.patch
|
||||
BuildArch: noarch
|
||||
%if %{with python3}
|
||||
BuildRequires: python3-devel
|
||||
@ -96,6 +99,7 @@ and source packages as well as spec files can be checked.
|
||||
%patch1 -p1 -b .flake
|
||||
%patch2 -p1 -b .missing-files
|
||||
%patch3 -p1 -b .py37mtime
|
||||
%patch4 -p1 -b .py37magic
|
||||
sed -i -e /MenuCheck/d Config.py
|
||||
cp -p config config.example
|
||||
install -pm 644 %{SOURCE3} config
|
||||
@ -145,6 +149,9 @@ make check PYTHON=%{python} PYTEST=%{pytest} FLAKE8=%{flake8}
|
||||
%{_mandir}/man1/rpmlint.1*
|
||||
|
||||
%changelog
|
||||
* Tue Jun 12 2018 Miro Hrončok <mhroncok@redhat.com> - 1.10-14
|
||||
- apply upstream fix for python 3.7 new magic numbers
|
||||
|
||||
* Sat Jun 2 2018 Tom Callaway <spot@fedoraproject.org> 1.10-13
|
||||
- apply upstream fix for python 3.7 mtime handling
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user