diff --git a/0001-Set-Python-3.4-magic-number-to-3310.patch b/0001-Set-Python-3.4-magic-number-to-3310.patch new file mode 100644 index 0000000..fb946f0 --- /dev/null +++ b/0001-Set-Python-3.4-magic-number-to-3310.patch @@ -0,0 +1,23 @@ +From 0929683e2544813d65ef85ae49b52ccdc6662746 Mon Sep 17 00:00:00 2001 +From: Sascha Peilicke +Date: Tue, 1 Apr 2014 12:47:30 +0200 +Subject: [PATCH] Set Python-3.4 magic number to 3310 + +This is the final magic number of the 3.4 release. +--- + FilesCheck.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: rpmlint-1.5/FilesCheck.py +=================================================================== +--- rpmlint-1.5.orig/FilesCheck.py ++++ rpmlint-1.5/FilesCheck.py +@@ -741,7 +741,7 @@ _python_magic_values = { + '3.1': 3150, + '3.2': 3180, + '3.3': 3230, +- '3.4': 3260, ++ '3.4': 3310, + } + + def get_expected_pyc_magic(path): diff --git a/extend-suse-conffiles-check.diff b/extend-suse-conffiles-check.diff index 7a86745..276dce2 100644 --- a/extend-suse-conffiles-check.diff +++ b/extend-suse-conffiles-check.diff @@ -2,7 +2,7 @@ Index: FilesCheck.py =================================================================== --- FilesCheck.py.orig +++ FilesCheck.py -@@ -1176,7 +1176,7 @@ class FilesCheck(AbstractCheck.AbstractC +@@ -1179,7 +1179,7 @@ class FilesCheck(AbstractCheck.AbstractC if nonexec_file and not docdir_examples_regex.search(f): printWarning(pkg, 'spurious-executable-perm', f) elif f.startswith('/etc/') and f not in config_files and \ diff --git a/invalid-filerequires.diff b/invalid-filerequires.diff index 503073b..1b62005 100644 --- a/invalid-filerequires.diff +++ b/invalid-filerequires.diff @@ -2,7 +2,7 @@ Index: TagsCheck.py =================================================================== --- TagsCheck.py.orig +++ TagsCheck.py -@@ -420,6 +420,7 @@ invalid_version_regex = re.compile('([0- +@@ -421,6 +421,7 @@ invalid_version_regex = re.compile('([0- # () are here for grouping purpose in the regexp forbidden_words_regex = re.compile('(' + Config.getOption('ForbiddenWords') + ')', re.IGNORECASE) valid_buildhost_regex = re.compile(Config.getOption('ValidBuildHost')) @@ -10,7 +10,7 @@ Index: TagsCheck.py use_epoch = Config.getOption('UseEpoch', False) use_utf8 = Config.getOption('UseUTF8', Config.USEUTF8_DEFAULT) max_line_len = Config.getOption('MaxLineLength', 79) -@@ -602,6 +603,9 @@ class TagsCheck(AbstractCheck.AbstractCh +@@ -599,6 +600,9 @@ class TagsCheck(AbstractCheck.AbstractCh if d[0].startswith('/usr/local/'): printError(pkg, 'invalid-dependency', d[0]) @@ -20,7 +20,7 @@ Index: TagsCheck.py if is_source: if lib_devel_number_regex.search(d[0]): printError(pkg, 'invalid-build-requires', d[0]) -@@ -1090,6 +1094,12 @@ explicit Requires: tags.''', +@@ -1106,6 +1110,12 @@ explicit Requires: tags.''', '''This package provides 2 times the same capacity. It should only provide it once.''', diff --git a/remove-expand-macros.diff b/remove-expand-macros.diff index 2fe0394..f2375d5 100644 --- a/remove-expand-macros.diff +++ b/remove-expand-macros.diff @@ -8,7 +8,7 @@ Index: TagsCheck.py =================================================================== --- TagsCheck.py.orig +++ TagsCheck.py -@@ -432,15 +432,6 @@ so_dep_regex = re.compile(r'\.so(\.[0-9a +@@ -431,15 +431,6 @@ so_dep_regex = re.compile(r'\.so(\.[0-9a # we assume that no rpm packages existed before rpm itself existed... oldest_changelog_timestamp = calendar.timegm(time.strptime("1995-01-01", "%Y-%m-%d")) @@ -24,7 +24,7 @@ Index: TagsCheck.py _enchant_checkers = {} def spell_check(pkg, str, fmt, lang, ignored): -@@ -857,30 +848,12 @@ class TagsCheck(AbstractCheck.AbstractCh +@@ -864,30 +855,12 @@ class TagsCheck(AbstractCheck.AbstractCh (apply(Pkg.formatRequire, obs), apply(Pkg.formatRequire, prov))) diff --git a/rpmlint-1.5-Fix-setgroups-error-name.diff b/rpmlint-1.5-Fix-setgroups-error-name.diff index 0599bc1..f81918a 100644 --- a/rpmlint-1.5-Fix-setgroups-error-name.diff +++ b/rpmlint-1.5-Fix-setgroups-error-name.diff @@ -11,7 +11,7 @@ Index: rpmlint-1.5/BinariesCheck.py =================================================================== --- rpmlint-1.5.orig/BinariesCheck.py +++ rpmlint-1.5/BinariesCheck.py -@@ -514,7 +514,7 @@ class BinariesCheck(AbstractCheck.Abstra +@@ -518,7 +518,7 @@ class BinariesCheck(AbstractCheck.Abstra printError(pkg, 'missing-PT_GNU_STACK-section', fname) if bin_info.setgid and bin_info.setuid and not bin_info.setgroups: diff --git a/rpmlint-fix-unexpanded-macros-for-array-values.patch b/rpmlint-fix-unexpanded-macros-for-array-values.patch index 67a69e0..36c6696 100644 --- a/rpmlint-fix-unexpanded-macros-for-array-values.patch +++ b/rpmlint-fix-unexpanded-macros-for-array-values.patch @@ -7,11 +7,11 @@ Subject: [PATCH] Fix _unexpanded_macros for array values TagsCheck.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) -diff --git a/TagsCheck.py b/TagsCheck.py -index c6f5dda..712d4e0 100644 ---- a/TagsCheck.py -+++ b/TagsCheck.py -@@ -533,13 +533,20 @@ class TagsCheck(AbstractCheck.AbstractCheck): +Index: rpmlint-1.5/TagsCheck.py +=================================================================== +--- rpmlint-1.5.orig/TagsCheck.py ++++ rpmlint-1.5/TagsCheck.py +@@ -524,13 +524,20 @@ class TagsCheck(AbstractCheck.AbstractCh AbstractCheck.AbstractCheck.__init__(self, 'TagsCheck') def _unexpanded_macros(self, pkg, tagname, value, is_url=False): @@ -37,6 +37,3 @@ index c6f5dda..712d4e0 100644 def check(self, pkg): --- -1.9.0 - diff --git a/rpmlint.changes b/rpmlint.changes index 036e1ea..0167948 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 8 08:52:02 UTC 2014 - dmueller@suse.com + +- add 0001-Set-Python-3.4-magic-number-to-3310.patch (bnc#876470) + ------------------------------------------------------------------- Tue May 6 08:05:16 UTC 2014 - lnussel@suse.de diff --git a/rpmlint.spec b/rpmlint.spec index 894401e..155e711 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -130,6 +130,7 @@ Patch96: rpmlint-decode-fix.diff Patch97: rpmlint-fix-unexpanded-macros-for-array-values.patch # PATCH-FIX-UPSTREAM: lnussel@suse.de - disallow /var/run and /var/lock Patch98: rpmlint-1.5-disallow-var-run-and-var-lock.diff +Patch99: 0001-Set-Python-3.4-magic-number-to-3310.patch %py_requires @@ -211,6 +212,7 @@ source packages can be checked. %patch96 -p1 %patch97 -p1 %patch98 -p1 +%patch99 -p1 cp -p %{SOURCE2} . # Only move top-level python files chmod 0755 rpmlint-checks-master/*.py diff --git a/suse-changelog.patch b/suse-changelog.patch index 16edeb5..d1ac396 100644 --- a/suse-changelog.patch +++ b/suse-changelog.patch @@ -2,7 +2,7 @@ Index: TagsCheck.py =================================================================== --- TagsCheck.py.orig +++ TagsCheck.py -@@ -1025,8 +1025,8 @@ Development/''', +@@ -1032,8 +1032,8 @@ Development/''', "%s".''' % '", "'.join(VALID_GROUPS), 'no-changelogname-tag', diff --git a/suse-python-abi-check.diff b/suse-python-abi-check.diff index f6adf8b..87dd016 100644 --- a/suse-python-abi-check.diff +++ b/suse-python-abi-check.diff @@ -2,7 +2,7 @@ Index: FilesCheck.py =================================================================== --- FilesCheck.py.orig +++ FilesCheck.py -@@ -1107,8 +1107,11 @@ class FilesCheck(AbstractCheck.AbstractC +@@ -1110,8 +1110,11 @@ class FilesCheck(AbstractCheck.AbstractC if res and not (pkg.check_versioned_dep('python-base', res.group(1)) or pkg.check_versioned_dep('python', diff --git a/suse-whitelist-opensuse.diff b/suse-whitelist-opensuse.diff index 609d740..dfefc8d 100644 --- a/suse-whitelist-opensuse.diff +++ b/suse-whitelist-opensuse.diff @@ -2,7 +2,7 @@ Index: TagsCheck.py =================================================================== --- TagsCheck.py.orig +++ TagsCheck.py -@@ -884,7 +884,7 @@ class TagsCheck(AbstractCheck.AbstractCh +@@ -891,7 +891,7 @@ class TagsCheck(AbstractCheck.AbstractCh spell_check(pkg, utf8summary, 'Summary(%s)', lang, ignored_words) if '\n' in summary: printError(pkg, 'summary-on-multiple-lines', lang) diff --git a/xdg-check-exception.diff b/xdg-check-exception.diff index 39fd135..ff855f2 100644 --- a/xdg-check-exception.diff +++ b/xdg-check-exception.diff @@ -1,8 +1,8 @@ -diff --git a/MenuXDGCheck.py b/MenuXDGCheck.py -index 0996585..29085d5 100644 ---- a/MenuXDGCheck.py -+++ b/MenuXDGCheck.py -@@ -40,13 +40,16 @@ class MenuXDGCheck(AbstractCheck.AbstractFilesCheck): +Index: rpmlint-1.5/MenuXDGCheck.py +=================================================================== +--- rpmlint-1.5.orig/MenuXDGCheck.py ++++ rpmlint-1.5/MenuXDGCheck.py +@@ -43,13 +43,16 @@ class MenuXDGCheck(AbstractCheck.Abstrac printError(pkg, 'non-utf8-desktopfile', filename) self.cfp.read(f)