From 348564642cca67f0af1084a63a502f24893aaddfd36b67eab01c49b35a0e2477 Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Wed, 15 Jun 2011 14:59:28 +0000
Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/rpmlint
 revision 126.0

OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=ad30b129c3431f6812a15b7c9f1e0011
---
 rpmlint.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpmlint.spec b/rpmlint.spec
index cb6acac..db01c05 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -23,7 +23,7 @@ Name:           rpmlint
 BuildRequires:  rpm-python xz
 Summary:        Rpm correctness checker
 Version:        1.2
-Release:        9
+Release:        11
 Source0:        http://rpmlint.zarb.org/download/rpmlint-%{version}.tar.xz
 Source1:        config
 Source1001:     config.in

From 95f0e79e9cd80f8335995bab5c489660d76e61f064caec4d81fe411196cd44c0 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 23 Jun 2011 12:40:45 +0000
Subject: [PATCH 2/3] - remove some false positives of the no-dependency-on
 checker

OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=39
---
 rpmlint.changes                    |  5 +++++
 rpmlint.spec                       |  2 ++
 suse-fix-library-dependencies.diff | 11 +++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 suse-fix-library-dependencies.diff

diff --git a/rpmlint.changes b/rpmlint.changes
index 852253f..83457ff 100644
--- a/rpmlint.changes
+++ b/rpmlint.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 23 14:39:51 CEST 2011 - dmueller@suse.de
+
+- remove some false positives of the no-dependency-on checker
+
 -------------------------------------------------------------------
 Wed Jun 15 12:34:09 UTC 2011 - lnussel@suse.de
 
diff --git a/rpmlint.spec b/rpmlint.spec
index db01c05..339e4f3 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -131,6 +131,7 @@ Patch89:        rpmlint-pie.diff
 # accepted upstream
 Patch90:        rpmlint-typo.diff
 Patch91:        rpmlint-subsys.diff
+Patch92:        suse-fix-library-dependencies.diff
 %py_requires
 
 %description
@@ -213,6 +214,7 @@ Authors:
 %patch88
 %patch89 -p1
 %patch90 -p1
+%patch92
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} .
 cp -p %{SOURCE3} .
diff --git a/suse-fix-library-dependencies.diff b/suse-fix-library-dependencies.diff
new file mode 100644
index 0000000..ef8519f
--- /dev/null
+++ b/suse-fix-library-dependencies.diff
@@ -0,0 +1,11 @@
+--- 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

From 10fb3cb6696ba463325621d5bcd1adb1d4c80d6b51797fe1d2f051ca0258ba91 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 23 Jun 2011 13:05:31 +0000
Subject: [PATCH 3/3] remove conflicting patch

OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=40
---
 rpmlint.spec                       |  2 --
 suse-fix-library-dependencies.diff | 11 -----------
 suse-shlib-devel-dependency.diff   |  2 +-
 3 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 suse-fix-library-dependencies.diff

diff --git a/rpmlint.spec b/rpmlint.spec
index 339e4f3..db01c05 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -131,7 +131,6 @@ Patch89:        rpmlint-pie.diff
 # accepted upstream
 Patch90:        rpmlint-typo.diff
 Patch91:        rpmlint-subsys.diff
-Patch92:        suse-fix-library-dependencies.diff
 %py_requires
 
 %description
@@ -214,7 +213,6 @@ Authors:
 %patch88
 %patch89 -p1
 %patch90 -p1
-%patch92
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} .
 cp -p %{SOURCE3} .
diff --git a/suse-fix-library-dependencies.diff b/suse-fix-library-dependencies.diff
deleted file mode 100644
index ef8519f..0000000
--- a/suse-fix-library-dependencies.diff
+++ /dev/null
@@ -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
diff --git a/suse-shlib-devel-dependency.diff b/suse-shlib-devel-dependency.diff
index 3cedd06..e357467 100644
--- a/suse-shlib-devel-dependency.diff
+++ b/suse-shlib-devel-dependency.diff
@@ -11,7 +11,7 @@ Index: TagsCheck.py
                      # 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)?[\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