Accepting request 448605 from home:StefanBruens:branches:devel:openSUSE:Factory:rpmlint_submit
Submit as requested in https://github.com/lnussel/rpmlint-code/pull/1 OBS-URL: https://build.opensuse.org/request/show/448605 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=418
This commit is contained in:
parent
3cf7aeba7b
commit
c4010c1a96
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 3 10:05:42 UTC 2017 - stefan.bruens@rwth-aachen.de
|
||||
|
||||
- add suse-readd_terminator_in_regex.patch
|
||||
Fixes bad detection of dependencies for devel packages
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 2 14:27:52 UTC 2017 - dmueller@suse.com
|
||||
|
||||
|
@ -117,6 +117,8 @@ Patch64: omit_BUILDROOT_from_pyo_files.patch
|
||||
# PATCH-FIX-UPSTREAM 0001-Fix-resolving-Python-source-from-3.5-.opt-12.pyc.patch alarrosa@suse.com -- Fixes resolving python source from files generated following PEP0488
|
||||
Patch65: 0001-Fix-resolving-Python-source-from-3.5-.opt-12.pyc.patch
|
||||
Patch66: issue_68_BinariesCheck_lower_memory.patch
|
||||
# Fix a regression introduced by suse-shlib-devel-dependency.diff
|
||||
Patch67: suse-readd_terminator_in_regex.patch
|
||||
# PATCHLIST END
|
||||
# BuildArch must at the end. is a bug: https://bugzilla.suse.com/show_bug.cgi?id=926766
|
||||
BuildArch: noarch
|
||||
|
24
suse-readd_terminator_in_regex.patch
Normal file
24
suse-readd_terminator_in_regex.patch
Normal file
@ -0,0 +1,24 @@
|
||||
From 0d93fa7656cb68c63c11d451d7894cac17af33e2 Mon Sep 17 00:00:00 2001
|
||||
From: StefanBruens <stefan.bruens@rwth-aachen.de>
|
||||
Date: Mon, 12 Dec 2016 20:12:46 +0100
|
||||
Subject: [PATCH] Readd dropped '$' in regex, fix broken check on devel
|
||||
dependency
|
||||
|
||||
The current regex also maches "Requires: libzork-data", although it should only match e.g. "libzork1" or "zork-libs". As the latter sorts after "libzork-data", an existing correct dependency may be missed.
|
||||
---
|
||||
TagsCheck.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/TagsCheck.py b/TagsCheck.py
|
||||
index fa6154c..e71d90b 100644
|
||||
--- a/TagsCheck.py
|
||||
+++ b/TagsCheck.py
|
||||
@@ -640,7 +640,7 @@ def check(self, pkg):
|
||||
base_or_libs = base + '*/' + base + '-libs/lib' + base + '*'
|
||||
# try to match *%_isa as well (e.g. "(x86-64)", "(x86-32)")
|
||||
base_or_libs_re = re.compile(
|
||||
- '^(lib)?%s(-libs)?[\d_]*(\(\w+-\d+\))?' % re.escape(base))
|
||||
+ '^(lib)?%s(-libs)?[\d_]*(\(\w+-\d+\))?$' % re.escape(base))
|
||||
for d in deps:
|
||||
if base_or_libs_re.match(d[0]):
|
||||
dep = d
|
Loading…
Reference in New Issue
Block a user