From 241b41a3d476e92842ec74f6da7d251bc107432a86bd3a12a8bbb01ae22b922b Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Sat, 28 Jun 2008 00:03:14 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=12

---
 rpmlint.changes          |  5 +++++
 rpmlint.spec             |  6 +++++-
 suse-factory-config.diff | 11 +++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 suse-factory-config.diff

diff --git a/rpmlint.changes b/rpmlint.changes
index 8a78702..bc47642 100644
--- a/rpmlint.changes
+++ b/rpmlint.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jun 28 01:29:30 CEST 2008 - dmueller@suse.de
+
+- also read /etc/rpmlint/factory.config
+
 -------------------------------------------------------------------
 Fri Jun 27 14:19:50 CEST 2008 - dmueller@suse.de
 
diff --git a/rpmlint.spec b/rpmlint.spec
index 3ad58fa..402f2d2 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -15,7 +15,7 @@ Name:           rpmlint
 BuildRequires:  rpm-python
 Summary:        Rpm correctness checker
 Version:        0.83
-Release:        2
+Release:        3
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        config
 Source1001:     config.in
@@ -89,6 +89,7 @@ Patch58:        add-weak-dependencies.diff
 Patch60:        selfconflicts-provide.diff
 Patch61:        fix-tabs-indenting.diff
 Patch62:        no-badness-return.diff
+Patch63:        suse-factory-config.diff
 %py_requires
 
 %description
@@ -154,6 +155,7 @@ Authors:
 %patch60
 %patch61
 %patch62
+%patch63
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} .
 cp -p %{SOURCE3} .
@@ -192,6 +194,8 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/man/man1/rpmlint.1.gz
 
 %changelog
+* Sat Jun 28 2008 dmueller@suse.de
+- also read /etc/rpmlint/factory.config
 * Fri Jun 27 2008 dmueller@suse.de
 - fix typo in suse-version check
 * Mon Jun 23 2008 dmueller@suse.de
diff --git a/suse-factory-config.diff b/suse-factory-config.diff
new file mode 100644
index 0000000..6b5d147
--- /dev/null
+++ b/suse-factory-config.diff
@@ -0,0 +1,11 @@
+--- rpmlint.py
++++ rpmlint.py
+@@ -225,7 +225,7 @@ conf_file='~/.rpmlintrc'
+ info_error=0
+ 
+ # load global config files
+-for f in ('/usr/share/rpmlint/config','/etc/rpmlint/config'):
++for f in ('/usr/share/rpmlint/config','/etc/rpmlint/config','/etc/rpmlint/factory.config'):
+     try:
+         execfile(f)
+     except IOError: