diff --git a/rpmlint-1.4-py3-magic-number-fix.patch b/rpmlint-1.4-py3-magic-number-fix.patch new file mode 100644 index 0000000..1ffe879 --- /dev/null +++ b/rpmlint-1.4-py3-magic-number-fix.patch @@ -0,0 +1,21 @@ +diff -up rpmlint-1.4/FilesCheck.py.py3 rpmlint-1.4/FilesCheck.py +--- rpmlint-1.4/FilesCheck.py.py3 2012-08-14 15:28:27.143695431 -0400 ++++ rpmlint-1.4/FilesCheck.py 2012-08-14 15:28:45.125694788 -0400 +@@ -285,7 +285,7 @@ def peek(filename, pkg, length=1024): + 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, +@@ -297,7 +297,7 @@ _python_magic_values = { + '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.config b/rpmlint.config index f2e9c0f..aaf249d 100644 --- a/rpmlint.config +++ b/rpmlint.config @@ -40,7 +40,7 @@ setOption("DanglingSymlinkExceptions", ( setOption("ValidLicenses", ( # These are the short names for all of the Fedora approved licenses. # The master list is kept here: http://fedoraproject.org/wiki/Licensing - # Last synced with revision "1.94, 20 September 2011" of that page. + # Last synced with revision "2.03, 13 August 2012" of that page. 'AAL', 'Abstyles', 'Adobe', @@ -63,9 +63,11 @@ setOption("ValidLicenses", ( 'ASL 1.1+', 'ASL 2.0', 'ASL 2.0+', + 'Bahyph', 'Barr', 'Beerware', 'BeOpen', + 'Bibtex', 'BitTorrent', 'Boost', 'Borceux', @@ -86,6 +88,7 @@ setOption("ValidLicenses", ( 'CPL', 'Crossword', 'Crystal Stacker', + 'diffmark', 'DOC', 'Dotseqn', 'DSDP', @@ -123,6 +126,7 @@ setOption("ValidLicenses", ( 'GPLv3 with exceptions', 'GPLv3+', 'GPLv3+ with exceptions', + 'HaskellReport', 'IBM', 'IJG', 'ImageMagick', @@ -134,9 +138,11 @@ setOption("ValidLicenses", ( 'Jabber', 'JasPer', 'JPython', + 'Julius', 'Knuth', 'Latex2e', 'LBNL BSD', + 'Leptonica', 'LGPLv2', 'LGPLv2 with exceptions', 'LGPLv2+', @@ -152,7 +158,9 @@ setOption("ValidLicenses", ( 'Logica', 'LPL', 'LPPL', + 'MakeIndex', 'mecab-ipadic', + 'midnight', 'MirOS', 'MIT', 'MIT with advertising', @@ -162,6 +170,7 @@ setOption("ValidLicenses", ( 'MPLv1.0+', 'MPLv1.1', 'MPLv1.1+', + 'MPLv2.0', 'MS-PL', 'MS-RL', 'Naumen', @@ -171,6 +180,7 @@ setOption("ValidLicenses", ( 'Newmat', 'Newsletr', 'NGPL', + 'NLPL', 'Nokia', 'NOSL', 'Noweb', @@ -189,11 +199,13 @@ setOption("ValidLicenses", ( 'OSL 2.1+', 'OSL 3.0', 'OSL 3.0+', + 'Par', 'Phorum', 'PHP', 'PlainTeX', 'Plexus', 'PostgreSQL', + 'psfrag', 'psutils', 'Public Domain', 'Python', @@ -233,6 +245,7 @@ setOption("ValidLicenses", ( 'wxWidgets', 'Xerox', 'xinetd', + 'xpp', 'XSkat', 'YPLv1.1', 'Zed', diff --git a/rpmlint.spec b/rpmlint.spec index 13a1e19..8bfba0c 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -1,6 +1,6 @@ Name: rpmlint Version: 1.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -15,6 +15,8 @@ Source4: %{name}.config.el4 # EL-5 specific config Source5: %{name}.config.el5 Patch0: rpmlint-1.4-encoding.patch +# http://sourceforge.net/p/rpmlint/code/ci/671bf6d21c6e878e6ee551ee4e2871df8947ac52/ +Patch1: rpmlint-1.4-py3-magic-number-fix.patch BuildArch: noarch BuildRequires: python >= 2.4 BuildRequires: rpm-python >= 4.4 @@ -44,6 +46,7 @@ and source packages as well as spec files can be checked. %prep %setup -q %patch0 -p1 -b .enc +%patch1 -p1 -b .py3 sed -i -e /MenuCheck/d Config.py cp -p config config.example install -pm 644 %{SOURCE2} CHANGES.package.old @@ -88,6 +91,10 @@ make check %changelog +* Tue Aug 14 2012 Tom Callaway - 1.4-8 +- add magic number fix for python 3 (bz845972) +- update license list + * Sat Jul 21 2012 Fedora Release Engineering - 1.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild