From 9e35e2f74e5a2cc042cace5a31ce363174fa526f9ca57c121589f8d1d3f1fc1e Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <null@suse.de>
Date: Wed, 21 Sep 2011 14:53:56 +0000
Subject: [PATCH] Accepting request 84021 from filesystems

- disable ctcs for > 11.4, not available

- Remove redundant tags/sections from specfile
- Use %_smp_mflags for parallel build

OBS-URL: https://build.opensuse.org/request/show/84021
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bonnie?expand=0&rev=12
---
 bonnie.changes | 11 +++++++++++
 bonnie.spec    | 27 ++++++++-------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/bonnie.changes b/bonnie.changes
index 45cc71e..ec84b6a 100644
--- a/bonnie.changes
+++ b/bonnie.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Sep 21 07:10:59 UTC 2011 - coolo@suse.com
+
+- disable ctcs for > 11.4, not available
+
+-------------------------------------------------------------------
+Sat Sep 17 20:27:30 UTC 2011 - jengelh@medozas.de
+
+- Remove redundant tags/sections from specfile
+- Use %_smp_mflags for parallel build
+
 -------------------------------------------------------------------
 Sun Aug 30 15:29:18 UTC 2009 - aj@suse.de
 
diff --git a/bonnie.spec b/bonnie.spec
index 4b63535..5fb905c 100644
--- a/bonnie.spec
+++ b/bonnie.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package bonnie (Version 1.4)
+# spec file for package bonnie
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -15,14 +15,12 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           bonnie
 Url:            http://www.garloff.de/kurt/linux/bonnie/
 License:        GPL v2 or later
 Group:          System/Benchmark
-AutoReqProv:    on
 Summary:        File System Benchmark
 Version:        1.4
 Release:        476
@@ -38,13 +36,6 @@ BuildRequires:  kernel-source
 Bonnie is a popular performance benchmark that targets various aspects
 of Unix file systems.
 
-
-
-Authors:
---------
-    Tim Bray <tbray@textuality.com>
-    Kurt Garloff <garloff@suse.de>
-
 %package ctcs2-glue
 License:        GPL v2 or later
 Summary:        File System Benchmark
@@ -56,22 +47,16 @@ Requires:       bonnie ctcs2 >= 0.1.1
 Bonnie is a popular performance benchmark that targets various aspects
 of Unix file systems.
 
-
-
-Authors:
---------
-    Tim Bray <tbray@textuality.com>
-    Kurt Garloff <garloff@suse.de>
-
 %prep
 %setup -n bonnie -a1
 %patch0 -p1
 
 %build
-make CC=gcc CFLAGS="$RPM_OPT_FLAGS"
+make CC=gcc CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir}
+%if %suse_version < 1210
 cd ctcstools
 mkdir -p $RPM_BUILD_ROOT/usr/share/qa/bonnie/tcf
 mkdir -p $RPM_BUILD_ROOT/usr/share/qa/tcf
@@ -80,6 +65,7 @@ install -m 744 do_bonnie $RPM_BUILD_ROOT/usr/share/qa/bonnie/
 install -m 644 *.tcf $RPM_BUILD_ROOT/usr/share/qa/bonnie/tcf/
 for A in *.tcf; do ln -s ../../../../usr/share/qa/bonnie/tcf/$A $RPM_BUILD_ROOT/usr/share/qa/tcf/; done
 install -m 744 bonnie-run $RPM_BUILD_ROOT/usr/lib/ctcs2/tools/ 
+%endif
 
 %files
 %defattr(-, root, root)
@@ -87,9 +73,12 @@ install -m 744 bonnie-run $RPM_BUILD_ROOT/usr/lib/ctcs2/tools/
 /usr/bin/bonnie
 %{_mandir}/man1/bonnie.1.gz
 
+%if %suse_version < 1210
+
 %files ctcs2-glue
 %defattr(-, root, root)
 /usr/share/qa
 /usr/lib/ctcs2
+%endif
 
 %changelog