forked from pool/rpmlint
remove conflicting patch
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=40
This commit is contained in:
parent
95f0e79e9c
commit
10fb3cb669
@ -131,7 +131,6 @@ Patch89: rpmlint-pie.diff
|
|||||||
# accepted upstream
|
# accepted upstream
|
||||||
Patch90: rpmlint-typo.diff
|
Patch90: rpmlint-typo.diff
|
||||||
Patch91: rpmlint-subsys.diff
|
Patch91: rpmlint-subsys.diff
|
||||||
Patch92: suse-fix-library-dependencies.diff
|
|
||||||
%py_requires
|
%py_requires
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -214,7 +213,6 @@ Authors:
|
|||||||
%patch88
|
%patch88
|
||||||
%patch89 -p1
|
%patch89 -p1
|
||||||
%patch90 -p1
|
%patch90 -p1
|
||||||
%patch92
|
|
||||||
cp -p %{SOURCE1} .
|
cp -p %{SOURCE1} .
|
||||||
cp -p %{SOURCE2} .
|
cp -p %{SOURCE2} .
|
||||||
cp -p %{SOURCE3} .
|
cp -p %{SOURCE3} .
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
--- TagsCheck.py
|
|
||||||
+++ TagsCheck.py
|
|
||||||
@@ -633,7 +633,7 @@
|
|
||||||
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)?(\(\w+-\d+\))?$' % re.escape(base))
|
|
||||||
+ '^(lib)?%s(-libs)?(\(\w+-\d+\))?' % re.escape(base))
|
|
||||||
for d in deps:
|
|
||||||
if base_or_libs_re.match(d[0]):
|
|
||||||
dep = d
|
|
@ -11,7 +11,7 @@ Index: TagsCheck.py
|
|||||||
# try to match *%_isa as well (e.g. "(x86-64)", "(x86-32)")
|
# try to match *%_isa as well (e.g. "(x86-64)", "(x86-32)")
|
||||||
base_or_libs_re = re.compile(
|
base_or_libs_re = re.compile(
|
||||||
- '^(lib)?%s(-libs)?(\(\w+-\d+\))?$' % re.escape(base))
|
- '^(lib)?%s(-libs)?(\(\w+-\d+\))?$' % re.escape(base))
|
||||||
+ '^(lib)?%s(-libs)?[\d_]*(\(\w+-\d+\))?$' % re.escape(base))
|
+ '^(lib)?%s(-libs)?[\d_]*(\(\w+-\d+\))?' % re.escape(base))
|
||||||
for d in deps:
|
for d in deps:
|
||||||
if base_or_libs_re.match(d[0]):
|
if base_or_libs_re.match(d[0]):
|
||||||
dep = d
|
dep = d
|
||||||
|
Loading…
Reference in New Issue
Block a user