rpm/rpmlint
SHA256
1
0
Fork 0
forked from pool/rpmlint
Code Pull Requests Activity

- remove unnecessary suse-check-optional-dependencies.diff

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=609
This commit is contained in:
Dirk Mueller 2018-07-12 14:14:52 +00:00 committed by Git OBS Bridge
parent 158dcaf71e
commit 03bc9c447d
3 changed files with 5 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rpmlint.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jul 12 14:05:01 UTC 2018 - dmueller@suse.com
- remove unnecessary suse-check-optional-dependencies.diff
-------------------------------------------------------------------
Wed Jul 11 09:06:31 UTC 2018 - dmueller@suse.com

1
rpmlint.spec
View File

@ -53,7 +53,6 @@ Patch30: devel-provide-is-devel-package.diff
Patch31: only-reg-files-are-scripts.diff
Patch32: buildroot-in-scripts.diff
Patch33: libtool-wrapper-check.diff
Patch34: suse-check-optional-dependencies.diff
Patch35: noarch-lib64.diff
Patch37: description-check.diff
Patch38: 0001-Tighten-wrong-script-interpreter-check-to-lower-fals.patch

55
suse-check-optional-dependencies.diff
View File

@ -1,55 +0,0 @@
From: Some One <nobody@opensuse.org>
Date: Thu, 9 Apr 2015 14:55:39 +0200
Subject: [PATCH] suse-check-optional-dependencies.diff
===================================================================
---
FilesCheck.py | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
Index: rpmlint-rpmlint-1.10/FilesCheck.py
===================================================================
--- rpmlint-rpmlint-1.10.orig/FilesCheck.py
+++ rpmlint-rpmlint-1.10/FilesCheck.py
@@ -535,6 +535,16 @@ class FilesCheck(AbstractCheck.AbstractC
if res.group(1) != pkg.name:
printError(pkg, 'incoherent-logrotate-file', f)
+ deps=[x[0] for x in pkg.requires()+pkg.recommends()+pkg.suggests()]
+ if res and not ('logrotate' in deps) and pkg.name != "logrotate":
+ printError(pkg, 'missing-dependency-to-logrotate', "for logrotate script", f)
+ if f.startswith('/etc/cron.') \
+ and not ('cron' in deps) and pkg.name != "cron":
+ printError(pkg, 'missing-dependency-to-cron', "for cron script", f)
+ if f.startswith('/etc/xinet.d/') \
+ and not ('xinetd' in deps) and pkg.name != "xinetd":
+ printError(pkg, 'missing-dependency-to-xinetd', "for xinet.d script", f)
+
if link != '':
ext = compr_regex.search(link)
if ext:
@@ -1338,6 +1348,24 @@ consequences), or other compiler flags w
extraction not working as expected. Verify that the binaries are not
unexpectedly stripped and that the intended compiler flags are used.''',
+'missing-dependency-to-cron',
+'''This package installs a file in /etc/cron.*/ but
+doesn't require cron to be installed. as cron is not part of the essential packages,
+your package should explicitely require cron to make sure that your cron job is
+executed. If it is an optional feature of your package, recommend or suggest cron.''',
+
+'missing-dependency-to-logrotate',
+'''This package installs a file in /etc/logrotate.d/ but
+doesn't require logrotate to be installed. Because logrotate is not part of the essential packages,
+your package should explicitely depend on logrotate to make sure that your logrotate
+job is executed. If it is an optional feature of your package, recommend or suggest logrotate.''',
+
+'missing-dependency-to-xinetd',
+'''This package installs a file in /etc/xinetd.d/ but
+doesn't require xinetd to be installed. Because xinetd is not part of the essential packages,
+your package should explicitely depend on logrotate to make sure that your xinetd
+job is executed. If it is an optional feature of your package, recommend or suggest xinetd.''',
+
'read-error',
'''This file could not be read. A reason for this could be that the info about
it in the rpm header indicates that it is supposed to be a readable normal file