From 535a7992d804f30e3e3b322f5358974bf2d3a85f80c8020780b4cc0873302939 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 18 Nov 2012 10:10:37 +0000 Subject: [PATCH] Accepting request 141583 from home:adra:branches:devel:openSUSE:Factory:rpmlint Added a patch (python3_magic_number_fix.diff) to update the magic number for python 3 OBS-URL: https://build.opensuse.org/request/show/141583 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=153 --- python3_magic_number_fix.diff | 20 ++++++++++++++++++++ rpmlint.changes | 6 ++++++ rpmlint.spec | 9 ++------- 3 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 python3_magic_number_fix.diff diff --git a/python3_magic_number_fix.diff b/python3_magic_number_fix.diff new file mode 100644 index 0000000..952f728 --- /dev/null +++ b/python3_magic_number_fix.diff @@ -0,0 +1,20 @@ +--- FilesCheck.py ++++ FilesCheck.py +@@ -286,7 +286,7 @@ + istext = float(len(t))/len(chunk) <= 0.30 + return (chunk, istext) + +-# See Python/import.c (in the trunk and py3k branches) for a full list of ++# See Python/import.c (in the default and 2.x branches) for a full list of + # the values here. + _python_magic_values = { + '2.2': 60717, +@@ -298,7 +298,7 @@ + '3.0': 3130, + '3.1': 3150, + '3.2': 3180, +- '3.3': 3190, ++ '3.3': 3230, + } + + def get_expected_pyc_magic(path): diff --git a/rpmlint.changes b/rpmlint.changes index b5ebd3e..5655f90 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 16 17:51:20 UTC 2012 - asterios.dramis@gmail.com + +- Added a patch (python3_magic_number_fix.diff) to update the magic number for + python 3 (patch taken from upstream). + ------------------------------------------------------------------- Wed Nov 14 14:06:53 UTC 2012 - meissner@suse.com diff --git a/rpmlint.spec b/rpmlint.spec index 4e91b28..356d300 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -116,19 +116,13 @@ Patch86: suse-rclink-check.diff # accepted upstream Patch88: suse-speccheck-utf8.diff Patch89: suse-python-abi-check.diff +Patch90: python3_magic_number_fix.diff %py_requires %description Rpmlint is a tool to check common errors on rpm packages. Binary and source packages can be checked. - - -Authors: --------- - Frederic Lepied - Gwenole Beauchesne - %prep %setup -q -n rpmlint-%{version} -a1 %patch0 @@ -195,6 +189,7 @@ Authors: #patch87 -p1 %patch88 %patch89 +%patch90 cp -p %{SOURCE2} . # Only move top-level python files chmod 0755 rpmlint-checks-master/*.py