forked from pool/rpmlint
Ludwig Nussel
bda5d592a2
- add script update_git.sh based on qemu's to simplify importing a patch series from git after rebasing. * Patches dropped: 0001-Python-3-compatibility-tweaks.patch (upstream) 0001-Set-Python-3.4-magic-number-to-3310.patch (upstream) add-scoring-support.diff (different upstream solution) check-buildroot-during-install.diff (need to fix no-cleaning-of-buildroot check upstream) fix-versioned-prereq.diff (was disabled, not sure what it's useful for) ignore-non-readable-in-etc.diff (filtered anyways) locale-support.diff (drop) locale-update.diff (different upstream solution now) more-verbose-lsb-check.diff (drop) perl-versioned-rpath-deps.diff (upstream) rpmlint-1.5-disallow-var-run-and-var-lock.diff (upstream) rpmlint-1.5-Fix-setgroups-error-name.diff (upstream) rpmlint-decode-fix.diff (different upstream solution) rpmlint-fix-unexpanded-macros-for-array-values.patch (different upstream solution) stricter-tags-check.diff (merged in weak deps and check-for-self-provides.diff) suppress-for-perl-python.diff (use filter instead) suse-binary-info-compile-opts.diff (drop) suse-changelog.patch (change config instead) suse-mono-deps-checks.diff (useful?) suse-required-lsb-tags.diff (different upstream solution) verify-buildrequires.diff (very build system specific, drop) xdg-check-exception.diff (upstream) * renamed patches: script-interpreter-only-for-exec-scripts.diff -> script-interpreter-only-for-exec-sc.diff confusing-invalid-spec-name.patch OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=317
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From 20d0203074b713a337cad87d8db5713bcc0bbf63 Mon Sep 17 00:00:00 2001
|
|
From: Some One <nobody@opensuse.org>
|
|
Date: Thu, 9 Apr 2015 14:55:38 +0200
|
|
Subject: [PATCH] usr-arch.diff
|
|
|
|
===================================================================
|
|
---
|
|
BinariesCheck.py | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/BinariesCheck.py b/BinariesCheck.py
|
|
index a74d3e3..c1c566d 100644
|
|
--- a/BinariesCheck.py
|
|
+++ b/BinariesCheck.py
|
|
@@ -270,6 +270,7 @@ usr_lib_exception_regex = re.compile(Config.getOption('UsrLibBinaryException', '
|
|
srcname_regex = re.compile('(.*?)-[0-9]')
|
|
invalid_dir_ref_regex = re.compile('/(home|tmp)(\W|$)')
|
|
ocaml_mixed_regex = re.compile('^Caml1999X0\d\d$')
|
|
+usr_arch_share_regex = re.compile('/share/.*/(?:x86|i.86|x86_64|ppc|ppc64|s390|s390x|ia64|m68k|arm|aarch64)')
|
|
|
|
|
|
def dir_base(path):
|
|
@@ -343,7 +344,7 @@ class BinariesCheck(AbstractCheck.AbstractCheck):
|
|
# arch dependent packages only from here on
|
|
|
|
# in /usr/share ?
|
|
- if fname.startswith('/usr/share/'):
|
|
+ if fname.startswith('/usr/share/') and not usr_arch_share_regex.search(fname):
|
|
printError(pkg, 'arch-dependent-file-in-usr-share', fname)
|
|
|
|
# in /etc ?
|