From a82f40d63eb188b29998d1fd32d2ef5cdb29de97 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Thu, 9 Mar 2017 18:09:18 +0100 Subject: [PATCH] Update Python 3.5.3 magic bytecode value --- rpmlint-1.9-py35magic.patch | 13 +++++++++++++ rpmlint.spec | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 rpmlint-1.9-py35magic.patch diff --git a/rpmlint-1.9-py35magic.patch b/rpmlint-1.9-py35magic.patch new file mode 100644 index 0000000..8644427 --- /dev/null +++ b/rpmlint-1.9-py35magic.patch @@ -0,0 +1,13 @@ +diff --git a/FilesCheck.py b/FilesCheck.py +index 112a9ec..b3465ca 100644 +--- a/FilesCheck.py ++++ b/FilesCheck.py +@@ -323,7 +323,7 @@ _python_magic_values = { + '3.2': 3180, + '3.3': 3230, + '3.4': 3310, +- '3.5': 3350, ++ '3.5': 3351, # 3350 for < 3.5.2 + '3.6': 3379, + } + diff --git a/rpmlint.spec b/rpmlint.spec index 74e312f..ab9191e 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -16,7 +16,7 @@ Name: rpmlint Version: 1.9 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools License: GPLv2 @@ -39,6 +39,9 @@ Patch0: rpmlint-1.9-unicodefix.patch Patch1: rpmlint-1.9-py36magic.patch # https://github.com/rpm-software-management/rpmlint/commit/a81fdca0185d5ed9868a6ddafca1812082029714 Patch2: rpmlint-1.9-fix-uep.patch +# Python 3.5.3 bytecode magic value update +# https://github.com/rpm-software-management/rpmlint/commit/beb32c4cfbff4aa979141941f534d2c6b7a18639 (hand-rediffed) +Patch3: rpmlint-1.9-py35magic.patch BuildArch: noarch %if %{with python3} BuildRequires: python3-devel @@ -92,6 +95,7 @@ and source packages as well as spec files can be checked. %patch0 -p1 -b .unicodefix %patch1 -p1 -b .py36magic %patch2 -p1 -b .fixuep +%patch3 -p1 -b .py35magic sed -i -e /MenuCheck/d Config.py cp -p config config.example install -pm 644 %{SOURCE3} config @@ -141,6 +145,9 @@ make check PYTHON=%{python} PYTEST=%{pytest} FLAKE8=%{flake8} %{_mandir}/man1/rpmlint.1* %changelog +* Thu Mar 9 2017 Charalampos Stratakis - 1.9-8 +- Update Python 3.5.3 magic bytecode value + * Wed Feb 8 2017 Tom Callaway - 1.9-7 - apply upstream fix to not demand versioned filename Provides/Obsoletes