SHA256
1
0
forked from pool/rpmlint

Accepting request 461830 from home:mimi_vx:branches:devel:openSUSE:Factory:rpmlint

- 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
This commit is contained in:
Dirk Mueller 2017-03-03 16:55:29 +00:00 committed by Git OBS Bridge
parent 1ea0b2e005
commit 32761c62fa
3 changed files with 20 additions and 0 deletions

View File

@ -0,0 +1,13 @@
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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 2 09:37:22 UTC 2017 - mimi.vx@gmail.com
- fix boo#1027577
patch boo1027577-license_tag.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 6 18:59:55 UTC 2017 - lars@linux-schulserver.de Mon Feb 6 18:59:55 UTC 2017 - lars@linux-schulserver.de

View File

@ -122,6 +122,7 @@ Patch663: issue_68_BinariesCheck_lower_memory-3.patch
Patch664: issue_68_BinariesCheck_lower_memory-4.patch Patch664: issue_68_BinariesCheck_lower_memory-4.patch
# Fix a regression introduced by suse-shlib-devel-dependency.diff # Fix a regression introduced by suse-shlib-devel-dependency.diff
Patch67: suse-readd_terminator_in_regex.patch Patch67: suse-readd_terminator_in_regex.patch
Patch68: boo1027577-license_tag.patch
# PATCHLIST END # PATCHLIST END
# BuildArch must at the end. is a bug: https://bugzilla.suse.com/show_bug.cgi?id=926766 # BuildArch must at the end. is a bug: https://bugzilla.suse.com/show_bug.cgi?id=926766
BuildArch: noarch BuildArch: noarch