diff --git a/rpmlint.changes b/rpmlint.changes index 7bb83f3..a432e11 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 8 20:41:52 UTC 2012 - coolo@suse.com + +- no longer allow semicolon in licenses + ------------------------------------------------------------------- Thu Oct 4 07:39:05 UTC 2012 - aj@suse.de diff --git a/rpmlint.spec b/rpmlint.spec index fe81837..4e91b28 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -116,7 +116,6 @@ Patch86: suse-rclink-check.diff # accepted upstream Patch88: suse-speccheck-utf8.diff Patch89: suse-python-abi-check.diff -Patch90: suse-allow-semicolon-as-license-separator.diff %py_requires %description @@ -196,7 +195,6 @@ Authors: #patch87 -p1 %patch88 %patch89 -%patch90 -p1 cp -p %{SOURCE2} . # Only move top-level python files chmod 0755 rpmlint-checks-master/*.py diff --git a/suse-allow-semicolon-as-license-separator.diff b/suse-allow-semicolon-as-license-separator.diff deleted file mode 100644 index a65bd1b..0000000 --- a/suse-allow-semicolon-as-license-separator.diff +++ /dev/null @@ -1,25 +0,0 @@ -From c867bce77f67c562a3f704d58dc7a30042f23081 Mon Sep 17 00:00:00 2001 -From: Ludwig Nussel -Date: Tue, 29 Nov 2011 10:39:05 +0100 -Subject: [PATCH] allow semicolon as license separator - ---- - TagsCheck.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/TagsCheck.py b/TagsCheck.py -index 762f465..5140202 100644 ---- a/TagsCheck.py -+++ b/TagsCheck.py -@@ -417,7 +417,7 @@ invalid_url_regex = re.compile(Config.getOption('InvalidURL'), re.IGNORECASE) - lib_package_regex = re.compile('(?:^(?:compat-)?lib.*?(\.so.*)?|libs?[\d-]*)$', re.IGNORECASE) - leading_space_regex = re.compile('^\s+') - pkg_config_regex = re.compile('^/usr/(?:lib\d*|share)/pkgconfig/') --license_regex = re.compile('\(([^)]+)\)|\s(?:and|or)\s') -+license_regex = re.compile('\(([^)]+)\)|\s(?:and|or|;)\s') - invalid_version_regex = re.compile('([0-9](?:rc|alpha|beta|pre).*)', re.IGNORECASE) - # () are here for grouping purpose in the regexp - forbidden_words_regex = re.compile('(' + Config.getOption('ForbiddenWords') + ')', re.IGNORECASE) --- -1.7.7 -