From b04e9e475824babeb43524ff825dd14b54fa2127256ed02b12d429aded841d46 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 9 Mar 2012 20:21:46 +0000 Subject: [PATCH] Accepting request 108544 from filesystems Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/108544 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bonnie?expand=0&rev=15 --- bonnie-1.4.dif | 60 ---------------------------------------------- bonnie-1.4.tar.bz2 | 3 --- bonnie-1.5.tar.bz2 | 3 +++ bonnie.changes | 5 ++++ bonnie.spec | 6 ++--- 5 files changed, 10 insertions(+), 67 deletions(-) delete mode 100644 bonnie-1.4.dif delete mode 100644 bonnie-1.4.tar.bz2 create mode 100644 bonnie-1.5.tar.bz2 diff --git a/bonnie-1.4.dif b/bonnie-1.4.dif deleted file mode 100644 index 3ebfbd3..0000000 --- a/bonnie-1.4.dif +++ /dev/null @@ -1,60 +0,0 @@ -diff -Naur /tmp/bonnie/bonnie/Bonnie.c bonnie/Bonnie.c ---- /tmp/bonnie/bonnie/Bonnie.c 2002-04-04 14:59:46.000000000 +0200 -+++ bonnie/Bonnie.c 2008-09-23 15:08:22.000000000 +0200 -@@ -79,7 +79,8 @@ - - #ifdef __linux__ - /* for o_direct */ --#include -+//#include -+#include - #endif - - #ifdef unix -@@ -170,6 +171,13 @@ - #define o_direct 0 - #endif - -+#ifndef PAGE_SIZE -+#define PAGE_SIZE getpagesize() -+#endif -+#ifndef PAGE_MASK -+#define PAGE_MASK (~(PAGE_SIZE - 1)) -+#endif -+ - int main( - int argc, - char * argv[]) -@@ -263,7 +271,7 @@ - memsz *= sysconf (_SC_PAGESIZE); - if (1024*1024*size <= memsz) - { -- fprintf (stderr, "Bonnie: Warning: You have %iMB RAM, but you test with only %iMB datasize!\n", -+ fprintf (stderr, "Bonnie: Warning: You have %iMB RAM, but you test with only %liMB datasize!\n", - memsz/(1024*1024), size); - fprintf (stderr, "Bonnie: This might yield unrealistically good results,\n"); - fprintf (stderr, "Bonnie: for reading and seeking%s.\n", -@@ -622,7 +630,7 @@ - } - - #define FLTBUFS 8 --char fltidx = 0; -+int fltidx = 0; - char fltbuf[8][FLTBUFS]; - char * cpupc (const int idx) - { -diff -Naur /tmp/bonnie/bonnie/Makefile bonnie/Makefile ---- /tmp/bonnie/bonnie/Makefile 2002-02-20 19:22:55.000000000 +0100 -+++ bonnie/Makefile 2008-09-23 15:08:53.000000000 +0200 -@@ -23,9 +23,9 @@ - # Added 99/07/20, - install: Bonnie - install -d $(DESTDIR)$(PREFIX)/bin -- install -s -m 0755 -o root -g root Bonnie $(DESTDIR)$(PREFIX)/bin/bonnie -+ install -m 0755 Bonnie $(DESTDIR)$(PREFIX)/bin/bonnie - install -d $(DESTDIR)$(MANDIR)/man1 -- install -m 0644 -o man -g root bonnie.1 $(DESTDIR)$(MANDIR)/man1/bonnie.1 -+ install -m 0644 bonnie.1 $(DESTDIR)$(MANDIR)/man1/bonnie.1 - gzip -9f $(DESTDIR)$(MANDIR)/man1/bonnie.1 - - clean: diff --git a/bonnie-1.4.tar.bz2 b/bonnie-1.4.tar.bz2 deleted file mode 100644 index 97b6cdd..0000000 --- a/bonnie-1.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f318dccb7081b3ae9b1a54a098ccb03f53f8c007a17ed601db3b7243e6795289 -size 18326 diff --git a/bonnie-1.5.tar.bz2 b/bonnie-1.5.tar.bz2 new file mode 100644 index 0000000..7c45900 --- /dev/null +++ b/bonnie-1.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eae780a2025cda86809537d5be75988f082b99b55da7cec9342060ed4f2a9f5a +size 19689 diff --git a/bonnie.changes b/bonnie.changes index ec84b6a..099e13c 100644 --- a/bonnie.changes +++ b/bonnie.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 1 16:48:56 CET 2012 - jeffm@suse.de + +- Update to 1.5: Minor changes. + ------------------------------------------------------------------- Wed Sep 21 07:10:59 UTC 2011 - coolo@suse.com diff --git a/bonnie.spec b/bonnie.spec index 9c0bf7f..88cd022 100644 --- a/bonnie.spec +++ b/bonnie.spec @@ -1,7 +1,7 @@ # # spec file for package bonnie # -# 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 @@ -22,11 +22,10 @@ Url: http://www.garloff.de/kurt/linux/bonnie/ License: GPL-2.0+ Group: System/Benchmark Summary: File System Benchmark -Version: 1.4 +Version: 1.5 Release: 476 Source0: %{name}-%{version}.tar.bz2 Source1: ctcstools.tar.bz2 -Patch0: bonnie-1.4.dif #Patch: %{name}-%{version}.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build #BuildRequires: linux-kernel-headers - fails on SLES-10-SP2 @@ -49,7 +48,6 @@ of Unix file systems. %prep %setup -n bonnie -a1 -%patch0 -p1 %build make CC=gcc CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}