Hello community, here is the log from the commit of package fio for openSUSE:Factory checked in at 2020-07-03 00:02:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fio (Old) and /work/SRC/openSUSE:Factory/.fio.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fio" Fri Jul 3 00:02:48 2020 rev:52 rq:811715 version:3.20 Changes: -------- --- /work/SRC/openSUSE:Factory/fio/fio.changes 2019-10-09 15:19:37.856471466 +0200 +++ /work/SRC/openSUSE:Factory/.fio.new.3060/fio.changes 2020-07-03 00:04:33.922507678 +0200 @@ -1,0 +2,14 @@ +Fri Jun 5 08:16:45 UTC 2020 - Martin Pluskal <[email protected]> + +- Update to version 3.20: + * No changelog available +- Add fio-gfio_main_ui.patch + +------------------------------------------------------------------- +Thu May 21 08:21:20 UTC 2020 - Paolo Stivanin <[email protected]> + +- Update to 3.19 (no changelog) +- Remove 0001-Fix-compilation-error-with-gfio.patch +- Remove fio.python2.patch + +------------------------------------------------------------------- Old: ---- 0001-Fix-compilation-error-with-gfio.patch fio-3.16.tar.bz2 fio.python2.patch New: ---- fio-3.20.tar.bz2 fio-gfio_main_ui.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fio.spec ++++++ --- /var/tmp/diff_new_pack.QSq2AT/_old 2020-07-03 00:04:36.886517492 +0200 +++ /var/tmp/diff_new_pack.QSq2AT/_new 2020-07-03 00:04:36.890517505 +0200 @@ -1,7 +1,7 @@ # # spec file for package fio # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2012 Pascal Bleser <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -35,21 +35,19 @@ %else %bcond_without librdmacm %endif - Name: fio -Version: 3.16 +Version: 3.20 Release: 0 Summary: Flexible I/O tester License: GPL-2.0-only Group: System/Benchmark -Url: http://git.kernel.dk/?p=fio.git;a=summary +URL: http://git.kernel.dk/?p=fio.git;a=summary Source: http://brick.kernel.dk/snaps/fio-%{version}.tar.bz2 -Patch0: fio.python2.patch -Patch1: 0001-Fix-compilation-error-with-gfio.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch0: fio-gfio_main_ui.patch BuildRequires: gtk2-devel BuildRequires: libaio-devel BuildRequires: libcurl-devel +BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: zlib-devel Suggests: gfio @@ -73,7 +71,6 @@ BuildRequires: libpmemblk-devel %endif %endif -BuildRequires: openssl-devel %if %{with librdmacm} BuildRequires: librdmacm-devel %endif @@ -100,10 +97,10 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build sed -i "s|%{_bindir}/bash|/bin/bash|g" tools/genfio +sed -i "s|-O3||g" Makefile # Not autotools configure ./configure \ --enable-gfio \ @@ -119,13 +116,16 @@ prefix="%{_prefix}" \ mandir="%{_mandir}" +# Drop py2 only tool +rm %{buildroot}%{_bindir}/fio-histo-log-pctiles.py + %check make %{?_smp_mflags} test %files %defattr(-, root, root) %if 0%{?sles_version} == 11 -%doc COPYING MORAL-LICENSE +%license COPYING MORAL-LICENSE %else %license COPYING MORAL-LICENSE %endif ++++++ fio-3.16.tar.bz2 -> fio-3.20.tar.bz2 ++++++ ++++ 16333 lines of diff (skipped) ++++++ fio-gfio_main_ui.patch ++++++ >From 63a4b9cca4ba3aa4101051402cbbe946ced17a49 Mon Sep 17 00:00:00 2001 From: Jens Axboe <[email protected]> Date: Tue, 2 Jun 2020 08:20:03 -0600 Subject: [PATCH] gfio: don't have multiple versions of main_ui Also comment a fall-through case appropriately, so newer GCC don't warn. Signed-off-by: Jens Axboe <[email protected]> --- gfio.c | 4 +++- gfio.h | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gfio.c b/gfio.c index 280539685..734651b67 100644 --- a/gfio.c +++ b/gfio.c @@ -38,6 +38,8 @@ #include "gclient.h" #include "graph.h" +struct gui main_ui; + static bool gfio_server_running; static unsigned int gfio_graph_limit = 100; @@ -223,7 +225,7 @@ static void update_button_states(struct gui *ui, struct gui_entry *ge) switch (ge->state) { default: gfio_report_error(ge, "Bad client state: %u\n", ge->state); - /* fall through to new state */ + /* fall-through */ case GE_STATE_NEW: connect_state = 1; edit_state = 1; diff --git a/gfio.h b/gfio.h index aa14e3c7d..2bf0ea242 100644 --- a/gfio.h +++ b/gfio.h @@ -78,7 +78,9 @@ struct gui { int handler_running; GHashTable *ge_hash; -} main_ui; +}; + +extern struct gui main_ui; enum { GE_STATE_NEW = 1,
