From 596a983bee4d357de1f957abb91958003d7dd29eace329cc39c1cd6ae6a02e51 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Mon, 1 Feb 2010 11:21:22 +0000
Subject: [PATCH] Accepting request 30901 from Base:System

Copy from Base:System/rpmlint based on submit request 30901 from user lnussel

OBS-URL: https://build.opensuse.org/request/show/30901
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=51
---
 rpmlint.changes | 6 ++++++
 rpmlint.spec    | 3 ++-
 usr-arch.diff   | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/rpmlint.changes b/rpmlint.changes
index a15d237..7cda49b 100644
--- a/rpmlint.changes
+++ b/rpmlint.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb  1 10:14:58 UTC 2010 - lnussel@suse.de
+
+- fix usr-arch.diff
+- require python-magic as it's needed by some checks
+
 -------------------------------------------------------------------
 Wed Jan 13 13:11:56 UTC 2010 - lnussel@suse.de
 
diff --git a/rpmlint.spec b/rpmlint.spec
index 79f1c3b..44a6b6e 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -23,7 +23,7 @@ Name:           rpmlint
 BuildRequires:  rpm-python
 Summary:        Rpm correctness checker
 Version:        0.92
-Release:        1
+Release:        2
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        config
 Source1001:     config.in
@@ -53,6 +53,7 @@ Group:          System/Packages
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       rpm-python, /usr/bin/readelf, file, findutils, cpio, bash
 Requires:       desktop-file-utils
+Requires:       python-magic
 BuildArch:      noarch
 Patch0:         rpmlint-suse.diff
 Patch2:         suse-version.diff
diff --git a/usr-arch.diff b/usr-arch.diff
index 80bc16c..3810bf2 100644
--- a/usr-arch.diff
+++ b/usr-arch.diff
@@ -13,7 +13,7 @@
                  else:
                      # in /usr/share ?
 -                    if fname.startswith('/usr/share/'):
-+                    if fname.startswith('/usr/share/') and not usr_arch_share.search(fname):
++                    if fname.startswith('/usr/share/') and not usr_arch_share_regex.search(fname):
                          printError(
                              pkg, 'arch-dependent-file-in-usr-share', fname)
                      # in /etc ?