diff --git a/.gitignore b/.gitignore index 1c4226f..ec3ca3d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /liburing-0.6.tar.gz.asc /liburing-0.7.tar.gz /liburing-0.7.tar.gz.asc +/liburing-2.0.tar.gz +/liburing-2.0.tar.gz.asc diff --git a/0001-spec-bump-version-to-2.0.patch b/0001-spec-bump-version-to-2.0.patch new file mode 100644 index 0000000..43b74a2 --- /dev/null +++ b/0001-spec-bump-version-to-2.0.patch @@ -0,0 +1,32 @@ +From 1815337f7dbb530ae3e3bc1175d8da214cf76eb5 Mon Sep 17 00:00:00 2001 +From: Stefan Hajnoczi +Date: Tue, 9 Mar 2021 14:19:12 +0000 +Subject: [PATCH 1/2] spec: bump version to 2.0 + +The shared library is now liburing.so.2 but the pkgconfig and rpm files +still say 0.7. Existing binaries link against liburing.so.1 and will not +automatically pick up the new liburing.so.2 shared library. + +Update the version number in liburing.spec so + +Signed-off-by: Stefan Hajnoczi +Link: https://lore.kernel.org/r/20210309141913.262131-2-stefanha@redhat.com +Signed-off-by: Jens Axboe +--- + liburing.spec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/liburing.spec b/liburing.spec +index fa4d970..8607074 100644 +--- a/liburing.spec ++++ b/liburing.spec +@@ -1,5 +1,5 @@ + Name: liburing +-Version: 0.7 ++Version: 2.0 + Release: 1%{?dist} + Summary: Linux-native io_uring I/O access library + License: (GPLv2 with exceptions and LGPLv2+) or MIT +-- +2.30.2 + diff --git a/0002-spec-add-explicit-build-dependency-on-make.patch b/0002-spec-add-explicit-build-dependency-on-make.patch new file mode 100644 index 0000000..ca11845 --- /dev/null +++ b/0002-spec-add-explicit-build-dependency-on-make.patch @@ -0,0 +1,35 @@ +From a9f23f088794c9b92c1471fc86c2b3c39ab475fd Mon Sep 17 00:00:00 2001 +From: Stefan Hajnoczi +Date: Tue, 9 Mar 2021 14:19:13 +0000 +Subject: [PATCH 2/2] spec: add explicit build dependency on make + +Fedora 34 is removing make from the buildroot. An explicit dependency is +now required: +https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot + +Adding an explicit build dependency on make seems reasonable across all +rpm-based distros. It won't hurt on distros where make is always +available in the buildroot. + +Signed-off-by: Stefan Hajnoczi +Link: https://lore.kernel.org/r/20210309141913.262131-3-stefanha@redhat.com +Signed-off-by: Jens Axboe +--- + liburing.spec | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/liburing.spec b/liburing.spec +index 8607074..0268d23 100644 +--- a/liburing.spec ++++ b/liburing.spec +@@ -7,6 +7,7 @@ Source0: https://brick.kernel.dk/snaps/%{name}-%{version}.tar.gz + Source1: https://brick.kernel.dk/snaps/%{name}-%{version}.tar.gz.asc + URL: https://git.kernel.dk/cgit/liburing/ + BuildRequires: gcc ++BuildRequires: make + + %description + Provides native async IO for the Linux kernel, in a fast and efficient +-- +2.30.2 + diff --git a/liburing.spec b/liburing.spec index 568d74d..675cd6d 100644 --- a/liburing.spec +++ b/liburing.spec @@ -1,6 +1,6 @@ Name: liburing -Version: 0.7 -Release: 4%{?dist} +Version: 2.0 +Release: 1%{?dist} Summary: Linux-native io_uring I/O access library License: (GPLv2 with exceptions and LGPLv2+) or MIT Source0: https://brick.kernel.dk/snaps/%{name}-%{version}.tar.gz @@ -8,6 +8,8 @@ Source1: https://brick.kernel.dk/snaps/%{name}-%{version}.tar.gz.asc URL: https://git.kernel.dk/cgit/liburing/ BuildRequires: gcc BuildRequires: make +Patch1: 0001-spec-bump-version-to-2.0.patch +Patch2: 0002-spec-add-explicit-build-dependency-on-make.patch %description Provides native async IO for the Linux kernel, in a fast and efficient @@ -45,8 +47,15 @@ for the Linux-native io_uring. %exclude %{_libdir}/liburing.a %{_libdir}/pkgconfig/* %{_mandir}/man2/* +%{_mandir}/man3/* +%{_mandir}/man7/* %changelog +* Tue Apr 13 2021 Stefan Hajnoczi - 2.0-1 +- Update to liburing 2.0. This release is source-compatible with 0.7 but + applications must be recompiled since struct sizes have changed. +- Add man3 and man7 documentation + * Tue Jan 26 2021 Fedora Release Engineering - 0.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index c59ab63..7ecaf70 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (liburing-0.7.tar.gz) = fcc04abcab9377c66c52b8114b4758a70a71a6e20575fd4114c07903ce8001b4764df8c7588d8b8d784c53306bfb561af6f1af6ad3459dc0c801464ce059fcb8 -SHA512 (liburing-0.7.tar.gz.asc) = d4b07308ffdc0818c0346a4d266a2a3e9d35801944fef70bb999b85e3aec7fa68498a2f8011fbcb9dc14a6e01a74f2ca75f1bd7e8c12311822a4e970ec433211 +SHA512 (liburing-2.0.tar.gz) = f895f2c7aae38a9929fa061bc5c648de07935c475b88629efcbf1781ec388f388cf55d6587803bde4fcd2814dfb5c9bd1cd48d62cde933a57bcee890e76b2c71 +SHA512 (liburing-2.0.tar.gz.asc) = f3d8cd11ef8a1ff0ac379be1faee058a5affe05579e1273cd9210a7980338253bb11a9f30319fed6c3fb74866ac54d88f6dd418ee72e3298cb5b459c5fd4e623