From c2d0aab2118252d3fc027c17f357fe9e26dd40492c2d082f442e501a2be13ece Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 10 Jan 2012 13:19:57 +0000
Subject: [PATCH] Accepting request 99499 from
 home:a_jaeger:branches:build-compare-test

Compare rpmlint.log as well.

OBS-URL: https://build.opensuse.org/request/show/99499
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=107
---
 build-compare.changes |  5 +++++
 build-compare.spec    |  6 +++---
 same-build-result.sh  | 12 +++++++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/build-compare.changes b/build-compare.changes
index 8415bf3..bba341d 100644
--- a/build-compare.changes
+++ b/build-compare.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan  9 13:15:33 UTC 2012 - aj@suse.de
+
+- Compare rpmlint.log if it exists.
+
 -------------------------------------------------------------------
 Sat Sep 17 21:08:18 UTC 2011 - jengelh@medozas.de
 
diff --git a/build-compare.spec b/build-compare.spec
index 3816b33..605eb61 100644
--- a/build-compare.spec
+++ b/build-compare.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package build-compare
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,10 +18,10 @@
 
 
 Name:           build-compare
-License:        GPLv2+
+License:        GPL-2.0+
 Group:          Development/Tools/Building
 Summary:        Build Result Compare Script
-Version:        2011.04.19
+Version:        2012.01.09
 Release:        6
 Source1:        COPYING
 Source2:        same-build-result.sh
diff --git a/same-build-result.sh b/same-build-result.sh
index 8b5a7d2..e4fbb0b 100644
--- a/same-build-result.sh
+++ b/same-build-result.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2009, 2010 SUSE Linux Product GmbH, Germany.
+# Copyright (c) 2009, 2010, 2012 SUSE Linux Product GmbH, Germany.
 # Licensed under GPL v2, see COPYING file for details.
 #
 # Written by Adrian Schroeter <adrian@suse.de>
@@ -85,6 +85,16 @@ if [ -n "${NEWRPMS[0]}" ]; then
   exit 1
 fi
 
+# Compare rpmlint.log files
+RPMLINTDIR=$NEWDIRS/../OTHER
+if [ -e $OLDDIR/rpmlint.log && -e $RPMLINTDIR/rpmlint.log ]; then
+  if ! cmp -s $OLDDIR/rpmlint.log $RPMLINTDIR/rpmlint.log; then
+    echo "rpmlint.log files differ:"
+    diff -u $OLDDIR/rpmlint.log $RPMLINTDIR/rpmlint.log|head -n 20
+    exit 1
+  fi
+fi
+
 if test $SUCCESS -eq 0; then
   exit 1
 fi