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
66 lines
2.8 KiB
Diff
66 lines
2.8 KiB
Diff
From 40b4e731258c4e03f298f27691e22ae4ca650ebb Mon Sep 17 00:00:00 2001
|
|
From: Some One <nobody@opensuse.org>
|
|
Date: Thu, 9 Apr 2015 14:55:40 +0200
|
|
Subject: [PATCH] remove-expand-macros.diff
|
|
|
|
commit 29e43a3e1676aa452f730a741d00ef4ac7baec96
|
|
Author: Ludwig Nussel <ludwig.nussel@suse.de>
|
|
Date: Tue May 17 12:56:38 2011 +0200
|
|
|
|
remove-expand-macros.diff
|
|
---
|
|
TagsCheck.py | 27 ---------------------------
|
|
1 file changed, 27 deletions(-)
|
|
|
|
diff --git a/TagsCheck.py b/TagsCheck.py
|
|
index fc392e5..40ce77a 100644
|
|
--- a/TagsCheck.py
|
|
+++ b/TagsCheck.py
|
|
@@ -432,15 +432,6 @@ so_dep_regex = re.compile(r'\.so(\.[0-9a-zA-z]+)*(\([^)]*\))*$')
|
|
# we assume that no rpm packages existed before rpm itself existed...
|
|
oldest_changelog_timestamp = calendar.timegm(time.strptime("1995-01-01", "%Y-%m-%d"))
|
|
|
|
-private_so_paths = set()
|
|
-for path in ('%perl_archlib', '%perl_vendorarch', '%perl_sitearch',
|
|
- '%python_sitearch', '%ruby_sitearch', '%php_extdir'):
|
|
- epath = rpm.expandMacro(path)
|
|
- if epath != path:
|
|
- private_so_paths.add(epath)
|
|
- private_so_paths.add(re.sub(r'/lib64(?=/|$)', '/lib', epath))
|
|
- private_so_paths.add(re.sub(r'/lib(?=/|$)', '/lib64', epath))
|
|
-
|
|
_enchant_checkers = {}
|
|
|
|
|
|
@@ -886,30 +877,12 @@ class TagsCheck(AbstractCheck.AbstractCheck):
|
|
(Pkg.formatRequire(*obs),
|
|
Pkg.formatRequire(*prov)))
|
|
|
|
- expfmt = rpm.expandMacro("%{_build_name_fmt}")
|
|
- if pkg.isSource():
|
|
- # _build_name_fmt often (always?) ends up not outputting src/nosrc
|
|
- # as arch for source packages, do it ourselves
|
|
- expfmt = re.sub(r'(?i)%\{?ARCH\b\}?', pkg.arch, expfmt)
|
|
- expected = pkg.header.sprintf(expfmt).split("/")[-1]
|
|
- basename = os.path.basename(pkg.filename)
|
|
- if basename != expected:
|
|
- printWarning(pkg, 'non-coherent-filename', basename, expected)
|
|
-
|
|
for tag in ('Distribution', 'DistTag', 'ExcludeArch', 'ExcludeOS',
|
|
'Vendor'):
|
|
if hasattr(rpm, 'RPMTAG_%s' % tag.upper()):
|
|
self._unexpanded_macros(pkg, tag,
|
|
Pkg.b2s(pkg[getattr(rpm, 'RPMTAG_%s' % tag.upper())]))
|
|
|
|
- for path in private_so_paths:
|
|
- for fname, pkgfile in pkg.files().items():
|
|
- if fname.startswith(path):
|
|
- for prov in pkgfile.provides:
|
|
- if so_dep_regex.search(prov[0]):
|
|
- printWarning(pkg, "private-shared-object-provides",
|
|
- fname, Pkg.formatRequire(*prov))
|
|
-
|
|
def check_description(self, pkg, lang, ignored_words):
|
|
description = pkg.langtag(rpm.RPMTAG_DESCRIPTION, lang)
|
|
self._unexpanded_macros(pkg, '%%description -l %s' % lang, description)
|