From 00c455b13f00777509452488575307c24e7b134e930c7f68541f3176a2fdab6e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 18 Apr 2015 08:39:07 +0000 Subject: [PATCH] Accepting request 297165 from benchmark Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/297165 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bonnie?expand=0&rev=20 --- bonnie.changes | 6 ++++++ bonnie.spec | 52 ++++++++--------------------------------------- ctcstools.tar.bz2 | 3 --- 3 files changed, 15 insertions(+), 46 deletions(-) delete mode 100644 ctcstools.tar.bz2 diff --git a/bonnie.changes b/bonnie.changes index 099e13c..8008827 100644 --- a/bonnie.changes +++ b/bonnie.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 9 10:56:17 UTC 2015 - mpluskal@suse.com + +- Cleanup spec file with spec-cleaner +- Remove ctcs packages + ------------------------------------------------------------------- Thu Mar 1 16:48:56 CET 2012 - jeffm@suse.de diff --git a/bonnie.spec b/bonnie.spec index 88cd022..0ca47e6 100644 --- a/bonnie.spec +++ b/bonnie.spec @@ -1,7 +1,7 @@ # # spec file for package bonnie # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,67 +16,33 @@ # - Name: bonnie -Url: http://www.garloff.de/kurt/linux/bonnie/ +Version: 1.5 +Release: 0 +Summary: File System Benchmark License: GPL-2.0+ Group: System/Benchmark -Summary: File System Benchmark -Version: 1.5 -Release: 476 +Url: https://code.google.com/p/bonnie-64/ Source0: %{name}-%{version}.tar.bz2 -Source1: ctcstools.tar.bz2 -#Patch: %{name}-%{version}.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -#BuildRequires: linux-kernel-headers - fails on SLES-10-SP2 -BuildRequires: kernel-source %description Bonnie is a popular performance benchmark that targets various aspects of Unix file systems. -%package ctcs2-glue -License: GPL-2.0+ -Summary: File System Benchmark -Group: System/Benchmark -Requires: bonnie ctcs2 >= 0.1.1 -#BuildArchitectures: noarch - -%description ctcs2-glue -Bonnie is a popular performance benchmark that targets various aspects -of Unix file systems. - %prep -%setup -n bonnie -a1 +%setup -q -n %{name} %build -make CC=gcc CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} +make CC=gcc CFLAGS="%{optflags}" %{?_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 -mkdir -p $RPM_BUILD_ROOT/usr/lib/ctcs2/tools -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 +make install DESTDIR=%{buildroot} MANDIR=%{_mandir} %files %defattr(-, root, root) %doc bonnie.doc README -/usr/bin/bonnie +%{_bindir}/bonnie %{_mandir}/man1/bonnie.1.gz -%if %suse_version < 1210 - -%files ctcs2-glue -%defattr(-, root, root) -/usr/share/qa -/usr/lib/ctcs2 -%endif - %changelog diff --git a/ctcstools.tar.bz2 b/ctcstools.tar.bz2 deleted file mode 100644 index 1994127..0000000 --- a/ctcstools.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c45a8366b0c93420a617b85de5a57d8273a19ef9a041d6c279ac13d96daa8faf -size 920