commit bonnie++ for openSUSE:Factory
Hello community, here is the log from the commit of package bonnie++ for openSUSE:Factory checked in at 2014-07-31 21:50:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bonnie++ (Old) and /work/SRC/openSUSE:Factory/.bonnie++.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bonnie++" Changes: -------- --- /work/SRC/openSUSE:Factory/bonnie++/bonnie++.changes 2011-10-16 12:43:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bonnie++.new/bonnie++.changes 2014-07-31 21:50:42.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 30 13:47:07 CEST 2014 - dsterba@suse.cz + +- upgraded source to version 1.97 + * fixed a bunch of bugs including bad CSV output. + +------------------------------------------------------------------- Old: ---- bonnie++-1.96.tgz New: ---- bonnie++-1.97.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bonnie++.spec ++++++ --- /var/tmp/diff_new_pack.HAstEd/_old 2014-07-31 21:50:44.000000000 +0200 +++ /var/tmp/diff_new_pack.HAstEd/_new 2014-07-31 21:50:44.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package bonnie++ # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -16,16 +16,16 @@ # - Name: bonnie++ -BuildRequires: gcc-c++ +Version: 1.97 +Release: 0 +Summary: A Bonnie-Like File System Benchmark License: MIT Group: System/Benchmark -Provides: bonnie++-1.96 -Summary: A Bonnie-Like File System Benchmark -Version: 1.96 -Release: 1 -Source: http://www.coker.com.au/bonnie++/bonnie++-1.96.tgz +Url: http://www.coker.com.au/bonnie++/ +Source: %{name}-%{version}.tgz +BuildRequires: gcc-c++ +Provides: bonnie++-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -33,27 +33,27 @@ hard drive and file system performance tests. %prep -%setup +%setup -q %build - make clean %{?_smp_mflags} - make MORECFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} +make clean %{?_smp_mflags} +make MORECFLAGS="%{optflags}" %{?_smp_mflags} %install - mkdir -p $RPM_BUILD_ROOT/usr/bin - /usr/bin/install -c bonnie++ zcav $RPM_BUILD_ROOT/usr/bin - /usr/bin/install -c bon_csv2html bon_csv2txt $RPM_BUILD_ROOT/usr/bin - mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,8} - /usr/bin/install -c -m 644 bon_csv2html.1 bon_csv2txt.1 $RPM_BUILD_ROOT%{_mandir}/man1 - /usr/bin/install -c -m 644 bonnie++.8 zcav.8 $RPM_BUILD_ROOT%{_mandir}/man8 +mkdir -p %{buildroot}%{_prefix}/bin +%{_bindir}/install -c bonnie++ zcav %{buildroot}%{_prefix}/bin +%{_bindir}/install -c bon_csv2html bon_csv2txt %{buildroot}%{_prefix}/bin +mkdir -p %{buildroot}%{_mandir}/man{1,8} +%{_bindir}/install -c -m 644 bon_csv2html.1 bon_csv2txt.1 %{buildroot}%{_mandir}/man1 +%{_bindir}/install -c -m 644 bonnie++.8 zcav.8 %{buildroot}%{_mandir}/man8 %files %defattr(-,root,root) %doc readme.html -/usr/bin/bonnie++ -/usr/bin/zcav -/usr/bin/bon_csv2html -/usr/bin/bon_csv2txt +%{_bindir}/bonnie++ +%{_bindir}/zcav +%{_bindir}/bon_csv2html +%{_bindir}/bon_csv2txt %{_mandir}/man8/bonnie++.8.gz %{_mandir}/man8/zcav.8.gz %{_mandir}/man1/bon_csv2html.1.gz ++++++ bonnie++-1.96.tgz -> bonnie++-1.97.tgz ++++++ ++++ 7100 lines of diff (skipped) ++++ retrying with extended exclude list Files old/bonnie++-1.96/.bon_csv2html.cpp.swp and new/bonnie++-1.97/.bon_csv2html.cpp.swp differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/bon_csv2html.1 new/bonnie++-1.97/bon_csv2html.1 --- old/bonnie++-1.96/bon_csv2html.1 2009-07-04 03:24:05.000000000 +0200 +++ new/bonnie++-1.97/bon_csv2html.1 2011-01-18 22:36:31.000000000 +0100 @@ -21,10 +21,10 @@ Before each field I list the field number as well as the name given in the heading .TP .B 0 format_version -Version of the output format in use (1.96) +Version of the output format in use (1.97) .TP .B 1 bonnie_version -(1.96) +(1.97) .TP .B 2 name Machine Name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/bon_csv2html.cpp new/bonnie++-1.97/bon_csv2html.cpp --- old/bonnie++-1.96/bon_csv2html.cpp 2009-07-03 08:21:11.000000000 +0200 +++ new/bonnie++-1.97/bon_csv2html.cpp 2012-11-23 09:22:33.000000000 +0100 @@ -43,14 +43,14 @@ bool col_used[MAX_ITEMS]; #define COL_NAME 2 #define COL_CONCURRENCY 3 -#define COL_FILE_SIZE 5 -#define COL_DATA_CHUNK_SIZE 6 +#define COL_FILE_size 5 +#define COL_DATA_CHUNK_size 6 #define COL_PUTC 7 #define COL_NUM_FILES 19 -#define COL_MAX_SIZE 20 -#define COL_MIN_SIZE 21 +#define COL_MAX_size 20 +#define COL_MIN_size 21 #define COL_NUM_DIRS 22 -#define COL_FILE_CHUNK_SIZE 23 +#define COL_FILE_CHUNK_size 23 #define COL_RAN_DEL_CPU 35 #define COL_PUTC_LATENCY 36 #define COL_SEEKS_LATENCY 41 @@ -90,11 +90,11 @@ props[i] = new PCCHAR[MAX_ITEMS]; props[i][0] = NULL; props[i][1] = NULL; - props[i][COL_NAME] = "bgcolor=\"#FFFFFF\" class=\"rowheader\">= COL_NUM_FILES && j <= COL_FILE_CHUNK_SIZE) || j <= COL_DATA_CHUNK_SIZE ) + if( (j >= COL_NUM_FILES && j <= COL_FILE_CHUNK_size) || j <= COL_DATA_CHUNK_size ) { props[i][j] = "class=\"size\" bgcolor=\"#FFFFFF\""; } @@ -109,32 +109,32 @@ for(i = 0; i < data.size(); i++) { // First print the average speed line - printf("<TR>"); - print_item(i, COL_NAME, "rowspan=2"); + printf("<tr>"); + print_item(i, COL_NAME, "rowspan=\"2\""); if(col_used[COL_CONCURRENCY] == true) print_item(i, COL_CONCURRENCY); - print_item(i, COL_FILE_SIZE); // file_size - if(col_used[COL_DATA_CHUNK_SIZE] == true) - print_item(i, COL_DATA_CHUNK_SIZE); + print_item(i, COL_FILE_size); // file_size + if(col_used[COL_DATA_CHUNK_size] == true) + print_item(i, COL_DATA_CHUNK_size); print_a_line(i, COL_PUTC, COL_NUM_FILES); - if(col_used[COL_MAX_SIZE]) - print_item(i, COL_MAX_SIZE); - if(col_used[COL_MIN_SIZE]) - print_item(i, COL_MIN_SIZE); + if(col_used[COL_MAX_size]) + print_item(i, COL_MAX_size); + if(col_used[COL_MIN_size]) + print_item(i, COL_MIN_size); if(col_used[COL_NUM_DIRS]) print_item(i, COL_NUM_DIRS); - if(col_used[COL_FILE_CHUNK_SIZE]) - print_item(i, COL_FILE_CHUNK_SIZE); - print_a_line(i, COL_FILE_CHUNK_SIZE + 1, COL_RAN_DEL_CPU); - printf("</TR>\n"); + if(col_used[COL_FILE_CHUNK_size]) + print_item(i, COL_FILE_CHUNK_size); + print_a_line(i, COL_FILE_CHUNK_size + 1, COL_RAN_DEL_CPU); + printf("</tr>\n"); // Now print the latency line - printf("<TR>"); + printf("<tr>"); int lat_width = 1; - if(col_used[COL_DATA_CHUNK_SIZE] == true) + if(col_used[COL_DATA_CHUNK_size] == true) lat_width++; if(col_used[COL_CONCURRENCY] == true) lat_width++; - printf("