up to 3.28

- guasi probe dropped upstream
- no-common patch no longer needed

diff --git a/fio-guasi.patch b/fio-guasi.patch
deleted file mode 100644 (file)
index 53bfbe5..0000000
--- a/fio-guasi.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urNp -x '*.orig' fio-3.23.org/configure fio-3.23/configure
---- fio-3.23.org/configure     2020-09-06 18:45:11.000000000 +0200
-+++ fio-3.23/configure 2021-10-09 23:26:34.042251668 +0200
-@@ -1325,7 +1325,8 @@ int main(int argc, char **argv)
-   return 0;
- }
- EOF
--if compile_prog "" "" "guasi"; then
-+if compile_prog "" "-lguasi" "guasi"; then
-+  LIBS="$LIBS -lguasi"
-   guasi="yes"
- fi
- print_config "GUASI" "$guasi"

diff --git a/fio-no-common.patch b/fio-no-common.patch
deleted file mode 100644 (file)
index f65c72a..0000000
--- a/fio-no-common.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urNp -x '*.orig' fio-3.23.org/gfio.c fio-3.23/gfio.c
---- fio-3.23.org/gfio.c        2020-09-06 18:45:11.000000000 +0200
-+++ fio-3.23/gfio.c    2021-10-09 23:26:34.305584665 +0200
-@@ -40,6 +40,7 @@
- 
- struct gui main_ui;
- 
-+struct gui main_ui;
- static bool gfio_server_running;
- static unsigned int gfio_graph_limit = 100;
- 
-diff -urNp -x '*.orig' fio-3.23.org/gfio.h fio-3.23/gfio.h
---- fio-3.23.org/gfio.h        2020-09-06 18:45:11.000000000 +0200
-+++ fio-3.23/gfio.h    2021-10-09 23:26:34.305584665 +0200
-@@ -53,7 +53,7 @@ struct gfio_graphs {
- /*
-  * Main window widgets and data
-  */
--struct gui {
-+extern struct gui {
-       GtkUIManager *uimanager;
-       GtkRecentManager *recentmanager;
-       GtkActionGroup *actiongroup;

diff --git a/fio.spec b/fio.spec
index 2780e50ba098adfdda2b4491a111607c8e7e29ff..1f6bce309747a1186ef2b4e378440dd8f788de5a 100644 (file)
--- a/fio.spec
+++ b/fio.spec
@@ -16,26 +16,25 @@
 Summary:       I/O tool for benchmark and stress/hardware verification
 Summary(pl.UTF-8):     Narzędzie do mierzenia wydajności I/O i sprawdzania sprawności sprzętu
 Name:          fio
-Version:       3.23
+Version:       3.28
 Release:       1
 License:       GPL v2+
 Group:         Applications/System
 Source0:       http://brick.kernel.dk/snaps/%{name}-%{version}.tar.bz2
-# Source0-md5: a524cccd497e59f14200fdd533a5de71
-Patch0:                %{name}-guasi.patch
-Patch1:                %{name}-no-common.patch
-Patch2:                %{name}-config.patch
+# Source0-md5: 09059eedfe246294049254355cdf2741
+Patch0:                %{name}-config.patch
 URL:           http://git.kernel.dk/?p=fio.git;a=summary
 BuildRequires: bison
 %{?with_ceph:BuildRequires:    ceph-devel}
 BuildRequires: flex
 %{?with_glusterfs:BuildRequires:       glusterfs-devel}
-BuildRequires: guasi-devel
 BuildRequires: libaio-devel
 BuildRequires: libibverbs-devel
+BuildRequires: libnfs-devel
 BuildRequires: librdmacm-devel
 BuildRequires: libzbc-devel
 BuildRequires: numactl-devel
+BuildRequires: pkgconfig
 %{?with_pmem:BuildRequires:    pmdk-devel}
 BuildRequires: sed >= 4.0
 BuildRequires: zlib-devel
@@ -76,8 +75,6 @@ OpenSolarisa.
 Summary:       Header files for developing FIO engine modules
 Summary(pl.UTF-8):     Pliki nagłówkowe do tworzenia modułów silników FIO
 Group:         Development/Libraries
-# doesn't require base
-Requires:      guasi-devel
 
 %description devel
 Header files for developing FIO engine modules.
@@ -104,8 +101,6 @@ na serwerze.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %{__sed} -i -e '1s,/usr/bin/bash,/bin/bash,' tools/genfio
 %{__sed} -i -e '1s,/usr/bin/env python3$,%{__python3},' tools/{hist/fio-histo-log-pctiles.py,plot/fio2gnuplot,hist/fiologparser_hist.py,fiologparser.py,fio_jsonplus_clat2csv}