SHA256
1
0
forked from pool/rpmlint

fix-diag-sortorder.diff, drop-unicodedata-dep.diff

OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=507
This commit is contained in:
Dirk Mueller 2017-09-30 19:54:42 +00:00 committed by Git OBS Bridge
parent 070235a841
commit 0dbbdc5cb8
3 changed files with 33 additions and 1 deletions

31
drop-unicodedata-dep.diff Normal file
View File

@ -0,0 +1,31 @@
diff --git a/SpecCheck.py b/SpecCheck.py
index 8cb85b3..45ad404 100644
--- a/SpecCheck.py
+++ b/SpecCheck.py
@@ -9,7 +9,6 @@
import re
import sys
-import unicodedata
try:
from urlparse import urlparse
except ImportError: # Python 3
@@ -106,7 +105,7 @@ filelist_regex = re.compile(r'\s+-f\s+\S+')
pkgname_regex = re.compile(r'\s+(?:-n\s+)?(\S+)')
tarball_regex = re.compile(r'\.(?:t(?:ar|[glx]z|bz2?)|zip)\b', re.IGNORECASE)
-UNICODE_NBSP = unicodedata.lookup('NO-BREAK SPACE')
+UNICODE_NBSP = u'\xa0'
def unversioned(deps):
@@ -206,8 +205,7 @@ class SpecCheck(AbstractCheck.AbstractCheck):
if do_unicode:
line = unicode(line, "utf-8", "replace") # noqa false positive
- char = line.find(nbsp)
- if char != -1:
+ if nbsp in line:
printWarning(pkg, "non-break-space", "line %s, char %d" %
(pkg.current_linenum, char))

View File

@ -91,7 +91,7 @@ Thu Sep 28 10:40:08 UTC 2017 - dmueller@suse.com
0003-Tighten-lib_regex-to-avoid-false-positive-in-python-.patch,
0001-Execute-chroot-tests-also-on-x86-rpms.patch,
ignore-readelf-ar-error.diff, remove-ghostfile-checks.diff,
fix-diag-sortorder.diff
fix-diag-sortorder.diff, drop-unicodedata-dep.diff
- drop config.in: unused
- switch to python 3.x

View File

@ -97,6 +97,7 @@ Patch60: 0003-Tighten-lib_regex-to-avoid-false-positive-in-python-.patch
Patch61: 0001-Execute-chroot-tests-also-on-x86-rpms.patch
Patch62: ignore-readelf-ar-error.diff
Patch63: fix-diag-sortorder.diff
Patch64: drop-unicodedata-dep.diff
Patch70: rpmlint-all-pie.patch
# BuildArch must at the end. is a bug: https://bugzilla.suse.com/show_bug.cgi?id=926766
BuildArch: noarch