forked from pool/rpmlint
10a26d790a
Accepted submit request 67998 from user coolo OBS-URL: https://build.opensuse.org/request/show/67998 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=101
50 lines
2.2 KiB
Diff
50 lines
2.2 KiB
Diff
Index: TagsCheck.py
|
|
===================================================================
|
|
--- TagsCheck.py.orig
|
|
+++ TagsCheck.py
|
|
@@ -433,13 +433,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"))
|
|
|
|
-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)
|
|
-
|
|
_enchant_checkers = {}
|
|
def spell_check(pkg, str, fmt, lang, ignored):
|
|
|
|
@@ -852,30 +845,12 @@ class TagsCheck(AbstractCheck.AbstractCh
|
|
(apply(Pkg.formatRequire, obs),
|
|
apply(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[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, apply(Pkg.formatRequire, prov))
|
|
-
|
|
|
|
def check_description(self, pkg, lang, ignored_words):
|
|
description = pkg.langtag(rpm.RPMTAG_DESCRIPTION, lang)
|