Hello community, here is the log from the commit of package bonnie++ for openSUSE:Factory checked in at 2016-06-19 12:53:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-10-18 09:10:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bonnie++.new/bonnie++.changes 2016-06-19 12:53:52.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Jun 19 08:09:29 UTC 2016 - mplus...@suse.com + +- Cleanup spec file with spec-cleaner +- Use configure and make install +- Add patches (both from Fedora): + * bonnie++-1.96-minmax.patch (building with gcc6 - boo#985139) + * bonnie++-1.96-makefile.patch (fixes installation using make) + +------------------------------------------------------------------- New: ---- bonnie++-1.96-makefile.patch bonnie++-1.96-minmax.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bonnie++.spec ++++++ --- /var/tmp/diff_new_pack.PD62t8/_old 2016-06-19 12:53:53.000000000 +0200 +++ /var/tmp/diff_new_pack.PD62t8/_new 2016-06-19 12:53:53.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package bonnie++ # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -24,6 +24,10 @@ Group: System/Benchmark Url: http://www.coker.com.au/bonnie++/ Source: http://www.coker.com.au/bonnie++/experimental/%{name}-%{version}.tgz +# PATCH-FIX-UPSTREAM bonnie++-1.96-makefile.patch -- fixes make install +Patch0: bonnie++-1.96-makefile.patch +# PATCH-FIX-UPSTREAM bonnie++-1.96-minmax.patch -- fixes building with gcc6 (boo#985139) +Patch1: bonnie++-1.96-minmax.patch BuildRequires: gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,29 +38,33 @@ %prep # match the upstream tarball, there's no diff against 1.97 %setup -q -n bonnie++-1.97.1 +%patch0 +%patch1 %build +%configure \ + --disable-stripping make clean %{?_smp_mflags} -make MORECFLAGS="%{optflags}" %{?_smp_mflags} +make MORECFLAGS="%{optflags}" LINK="g++ -Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" %{?_smp_mflags} %install -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 +%make_install %files %defattr(-,root,root) -%doc readme.html -%{_bindir}/bonnie++ -%{_bindir}/zcav +%doc README-2.00 README.txt %{_bindir}/bon_csv2html %{_bindir}/bon_csv2txt -%{_mandir}/man8/bonnie++.8.gz -%{_mandir}/man8/zcav.8.gz -%{_mandir}/man1/bon_csv2html.1.gz -%{_mandir}/man1/bon_csv2txt.1.gz +%{_bindir}/generate_randfile +%{_sbindir}/bonnie++ +%{_sbindir}/getc_putc +%{_sbindir}/getc_putc_helper +%{_sbindir}/zcav +%{_mandir}/man1/bon_csv2html.1%{ext_man} +%{_mandir}/man1/bon_csv2txt.1%{ext_man} +%{_mandir}/man1/generate_randfile.1%{ext_man} +%{_mandir}/man8/bonnie++.8%{ext_man} +%{_mandir}/man8/getc_putc.8%{ext_man} +%{_mandir}/man8/zcav.8%{ext_man} %changelog ++++++ bonnie++-1.96-makefile.patch ++++++ Index: Makefile.in =================================================================== --- Makefile.in.orig 2008-12-30 22:04:25.000000000 +0100 +++ Makefile.in 2016-06-19 10:00:30.009151497 +0200 @@ -17,6 +17,8 @@ THREAD_LFLAGS=@thread_ldflags@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ +DESTDIR= + BONSRC=bonnie++.cpp bon_io.cpp bon_file.cpp bon_time.cpp semaphore.cpp \ sync.cpp thread.cpp bon_suid.cpp duration.cpp rand.o util.o BONOBJS=$(BONSRC:.cpp=.o) @@ -52,15 +54,15 @@ generate_randfile: generate_randfile.o $(LINK) generate_randfile.o -o generate_randfile install-bin: $(EXE) $(EXES) - mkdir -p $(eprefix)/bin $(eprefix)/sbin - @INSTALL_PROGRAM@ @stripping@ $(EXES) $(eprefix)/sbin - @INSTALL_PROGRAM@ @stripping@ $(EXE) $(eprefix)/bin - @INSTALL_SCRIPT@ $(SCRIPTS) $(eprefix)/bin + mkdir -p $(DESTDIR)$(eprefix)/bin $(DESTDIR)$(eprefix)/sbin + @INSTALL_PROGRAM@ @stripping@ $(EXES) $(DESTDIR)$(eprefix)/sbin + @INSTALL_PROGRAM@ @stripping@ $(EXE) $(DESTDIR)$(eprefix)/bin + @INSTALL_SCRIPT@ $(SCRIPTS) $(DESTDIR)$(eprefix)/bin install: install-bin - mkdir -p @mandir@/man1 @mandir@/man8 - @INSTALL_DATA@ $(MAN1) @mandir@/man1 - @INSTALL_DATA@ $(MAN8) @mandir@/man8 + mkdir -p $(DESTDIR)@mandir@/man1 $(DESTDIR)@mandir@/man8 + @INSTALL_DATA@ $(MAN1) $(DESTDIR)@mandir@/man1 + @INSTALL_DATA@ $(MAN8) $(DESTDIR)@mandir@/man8 %.o: %.cpp $(CXX) -c $< ++++++ bonnie++-1.96-minmax.patch ++++++ Index: port.h.in =================================================================== --- port.h.in.orig 2008-12-24 01:16:16.000000000 +0100 +++ port.h.in 2016-06-19 09:53:58.510141644 +0200 @@ -4,9 +4,11 @@ #include "conf.h" #ifndef HAVE_MIN_MAX -#if defined(HAVE_ALGO_H) || defined(HAVE_ALGO) -#ifdef HAVE_ALGO -#include <algo> +#if defined(HAVE_ALGO_H) || defined(HAVE_ALGORITHM) +#ifdef HAVE_ALGORITHM +#undef min +#undef max +#include <algorithm> #else #include <algo.h> #endif @@ -49,8 +51,8 @@ typedef struct timeval TIMEVAL_TYPE; #endif typedef int FILE_TYPE; -#define __min min -#define __max max +// #define __min min +// #define __max max typedef unsigned int UINT; typedef unsigned long ULONG; typedef const char * PCCHAR; Index: bonnie++.cpp =================================================================== --- bonnie++.cpp.orig 2009-07-03 04:38:14.000000000 +0200 +++ bonnie++.cpp 2016-06-19 09:53:58.510141644 +0200 @@ -24,6 +24,8 @@ #include "conf.h" #ifdef HAVE_ALGORITHM #include <algorithm> +#undef min +#undef max #else #ifdef HAVE_ALGO #include <algo> @@ -73,7 +75,7 @@ public: void set_io_chunk_size(int size) { delete m_buf; pa_new(size, m_buf, m_buf_pa); m_io_chunk_size = size; } void set_file_chunk_size(int size) - { delete m_buf; m_buf = new char[__max(size, m_io_chunk_size)]; m_file_chunk_size = size; } + { delete m_buf; m_buf = new char[max(size, m_io_chunk_size)]; m_file_chunk_size = size; } // Return the page-aligned version of the local buffer char *buf() { return m_buf_pa; } @@ -138,7 +140,7 @@ CGlobalItems::CGlobalItems(bool *exitFla , m_buf(NULL) , m_buf_pa(NULL) { - pa_new(__max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa); + pa_new(max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa); SetName("."); } @@ -393,8 +395,8 @@ int main(int argc, char *argv[]) usage(); } #endif - globals.byte_io_size = __min(file_size, globals.byte_io_size); - globals.byte_io_size = __max(0, globals.byte_io_size); + globals.byte_io_size = min(file_size, globals.byte_io_size); + globals.byte_io_size = max(0, globals.byte_io_size); if(machine == NULL) { Index: duration.cpp =================================================================== --- duration.cpp.orig 2008-12-23 23:26:42.000000000 +0100 +++ duration.cpp 2016-06-19 09:53:58.510141644 +0200 @@ -12,6 +12,8 @@ using namespace std; #ifdef HAVE_ALGORITHM #include <algorithm> +#undef min +#undef max #else #ifdef HAVE_ALGO #include <algo> @@ -38,7 +40,7 @@ double Duration_Base::stop() getTime(&tv); double ret; ret = tv - m_start; - m_max = __max(m_max, ret); + m_max = max(m_max, ret); return ret; }
