From 83ae5c529578846eda096335417d84ab30c9900b44453cbbe6ba652ca92dd55b Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 9 Feb 2009 09:44:19 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=38 --- CheckFilelist.py | 15 ++++++++++++--- config | 10 ++-------- locale-update.diff | 16 ++++------------ rpmlint.changes | 6 ++++++ rpmlint.spec | 5 ++++- 5 files changed, 28 insertions(+), 24 deletions(-) diff --git a/CheckFilelist.py b/CheckFilelist.py index 3f57843..b369d82 100644 --- a/CheckFilelist.py +++ b/CheckFilelist.py @@ -15,7 +15,7 @@ import fnmatch from rpm import RPMTAG_VENDOR _defaulterror = 'suse-filelist-forbidden' -_defaultmsg = '%(file)s is not allowed in SUSE Linux' +_defaultmsg = '%(file)s is not allowed in SUSE' def notnoarch(pkg): return pkg.arch != 'noarch' @@ -127,12 +127,21 @@ _checks = [ '/etc/rc.config.d/*', '/etc/init.d/*/*', '/usr/share/locale/LC_MESSAGES', + ], + }, + { + 'error': 'suse-filelist-forbidden-perl-dir', + 'details': '''perl files installed a non-vendor installed path, + which is not allowed in SUSE.''', + 'bad': [ '/usr/lib/perl5/site_perl/*', '/usr/lib/perl5/vendor_perl/5.*/auto', '/usr/lib/perl5/vendor_perl/5.*/*-linux-*/auto', ], - }, + }, { + 'error': 'suse-filelist-forbidden-backup-file', + 'details': 'backup files (e.g. files ending in ~ or .bak) are not allowed', 'bad': [ '*~', '*.bak', @@ -349,7 +358,7 @@ class FilelistCheck(AbstractCheck.AbstractCheck): files = pkg.files() if not files: - printError(pkg, 'suse-filelist-empty', 'packages without any files are not allowed in SUSE Linux') + printError(pkg, 'suse-filelist-empty', 'packages without any files are not allowed in SUSE') return for check in _checks: diff --git a/config b/config index f463860..b100f73 100644 --- a/config +++ b/config @@ -216,15 +216,9 @@ addFilter("beagle-index\.\S+: \w: (non-devel|unnecessary)-buildrequires") addFilter("collect-desktop-files\.\S+: \w: (non-devel|unnecessary)-buildrequires") addFilter("installation-images\.\S+: \w: (non-devel|unnecessary)-buildrequires") -# directory used by statd +# exceptions for filelist checks addFilter("nfs-client\.\S+: \w: suse-filelist-forbidden /var/lib/nfs/sm.bak ") - -# perl must have those -addFilter("perl\.\S+: \w: suse-filelist-forbidden /usr/lib/perl5/site_perl/.* ") -addFilter("perl\.\S+: \w: suse-filelist-forbidden /usr/lib/perl5/vendor_perl/5\..*/auto ") -addFilter("perl\.\S+: \w: suse-filelist-forbidden /usr/lib/perl5/vendor_perl/5\..*/.*-linux-.*/auto ") - -# texinfo maintains that file +addFilter("perl\.\S+: \w: suse-filelist-forbidden-perl-dir ") addFilter("texinfo\.\S+: \w: suse-filelist-forbidden /usr/share/info/dir ") # suboptimal library packaging diff --git a/locale-update.diff b/locale-update.diff index 16912a6..5747881 100644 --- a/locale-update.diff +++ b/locale-update.diff @@ -1,21 +1,12 @@ --- I18NCheck.py +++ I18NCheck.py -@@ -35,7 +35,7 @@ INCORRECT_LOCALES = { +@@ -35,22 +35,22 @@ # # 'en_RN' and 'en@IPA' are not real language bu funny variations on english CORRECT_SUBDIRS = ( -'af', 'am', 'ang', 'ar', 'as', 'az', 'az_IR', 'be', 'bg', 'bn', 'bn_IN', 'br', -+'af', 'am', 'ang', 'ar', 'as', 'az', 'az_IR', 'be', 'be@latin', 'bg', 'bn', 'bn_IN', 'br', - 'bs', 'ca', 'cs', 'cy', 'da', 'de', 'de_AT', 'dz', 'el', - 'en_AU', 'en_CA', 'en_GB', 'en_IE', 'en_US', 'en_RN', 'en@IPA', - 'eo', 'es', 'es_AR', 'es_ES', 'es_DO', 'es_GT', 'es_HN', 'es_SV', 'es_PE', ---- I18NCheck.py -+++ I18NCheck.py -@@ -36,21 +36,21 @@ INCORRECT_LOCALES = { - # 'en_RN' and 'en@IPA' are not real language bu funny variations on english - CORRECT_SUBDIRS = ( - 'af', 'am', 'ang', 'ar', 'as', 'az', 'az_IR', 'be', 'be@latin', 'bg', 'bn', 'bn_IN', 'br', -'bs', 'ca', 'cs', 'cy', 'da', 'de', 'de_AT', 'dz', 'el', ++'af', 'am', 'ang', 'ar', 'as', 'az', 'az_IR', 'be', 'be@latin', 'bg', 'bn', 'bn_IN', 'br', +'bs', 'ca', 'ca@valencia', 'cs', 'cy', 'da', 'de', 'de_AT', 'dz', 'el', 'en_AU', 'en_CA', 'en_GB', 'en_IE', 'en_US', 'en_RN', 'en@IPA', 'eo', 'es', 'es_AR', 'es_ES', 'es_DO', 'es_GT', 'es_HN', 'es_SV', 'es_PE', @@ -30,8 +21,9 @@ 'mg', 'mi', 'mk', 'ml', 'mn', 'mr', 'ms', 'mt', 'my', 'nb', 'nds', 'nds_DE', 'ne', 'nl', 'nn', 'no', 'nr', 'nso', -'oc', 'or', 'pa_IN', 'ph', 'pl', 'pp', 'pt', 'pt_BR', 'qu', 'ro', 'ru', 'rw', +-'sc', 'se', 'si', 'sk', 'sl', 'sq', 'sr', 'sr@Latn', 'sr@ije', 'ss', 'st', +'oc', 'or', 'pa_IN', 'ph', 'pl', 'pp', 'ps', 'pt', 'pt_BR', 'qu', 'ro', 'ru', 'rw', - 'sc', 'se', 'si', 'sk', 'sl', 'sq', 'sr', 'sr@Latn', 'sr@ije', 'ss', 'st', ++'sc', 'se', 'si', 'sk', 'sl', 'sq', 'sr', 'sr@latin', 'sr@ije', 'ss', 'st', 'sv', 'ta', 'te', 'tg', 'th', 'tk', 'tl', 'tn', 'tr', 'ts', 'tt', -'ug', 'uk', 'ur', 'uz', 'uz@Latn', +'ug', 'uk', 'ur', 'uz', 'uz@cyrillic', diff --git a/rpmlint.changes b/rpmlint.changes index 74ff0a6..1825575 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 2 14:59:50 CET 2009 - dmueller@suse.de + +- improve information hint for perl blacklisted paths +- fix language list for sr (bnc#471254) + ------------------------------------------------------------------- Fri Jan 30 14:35:48 CET 2009 - lnussel@suse.de diff --git a/rpmlint.spec b/rpmlint.spec index da30f04..4ec2068 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -22,7 +22,7 @@ Name: rpmlint BuildRequires: rpm-python Summary: Rpm correctness checker Version: 0.84 -Release: 13 +Release: 14 Source0: %{name}-%{version}.tar.bz2 Source1: config Source1001: config.in @@ -222,6 +222,9 @@ rm -rf $RPM_BUILD_ROOT /usr/share/man/man1/rpmlint.1.gz %changelog +* Mon Feb 02 2009 dmueller@suse.de +- improve information hint for perl blacklisted paths +- fix language list for sr (bnc#471254) * Fri Jan 30 2009 lnussel@suse.de - add exception for nfs-utils, texinfo and perl - allow backup files if they are ghost files