forked from pool/rpmlint
Dirk Mueller
32761c62fa
- fix boo#1027577 patch boo1027577-license_tag.patch OBS-URL: https://build.opensuse.org/request/show/461830 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=430
14 lines
772 B
Diff
14 lines
772 B
Diff
Index: rpmlint-rpmlint-1.8/TagsCheck.py
|
|
===================================================================
|
|
--- rpmlint-rpmlint-1.8.orig/TagsCheck.py
|
|
+++ rpmlint-rpmlint-1.8/TagsCheck.py
|
|
@@ -446,7 +446,7 @@ invalid_url_regex = re.compile(Config.ge
|
|
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|AND|OR)\s')
|
|
license_exception_regex = re.compile('(\S+)\sWITH\s(\S+)')
|
|
invalid_version_regex = re.compile('([0-9](?:rc|alpha|beta|pre).*)', re.IGNORECASE)
|
|
# () are here for grouping purpose in the regexp
|