Update libblkio to released version 1.1.0

New bundled deps:
 * vendor/num-traits
 * vendor/pci-driver

Add "Provides: bundled(rust-...)" for bundled deps.

Remove hand-generated libblkio.so.* symlinks.

See: https://bugzilla.redhat.com/show_bug.cgi?id=2124697#c21

diff --git a/libblkio/libblkio-c8f5ed9a1460d90a522bda55da09f013fa7da61c.tar.bz2 b/libblkio/libblkio-c8f5ed9a1460d90a522bda55da09f013fa7da61c.tar.bz2
deleted file mode 100644 (file)
index d2c7e1e..0000000
Binary files a/libblkio/libblkio-c8f5ed9a1460d90a522bda55da09f013fa7da61c.tar.bz2 and /dev/null differ

diff --git a/libblkio/libblkio-v1.1.0.tar.bz2 b/libblkio/libblkio-v1.1.0.tar.bz2
new file mode 100644 (file)
index 0000000..aff23ab
Binary files /dev/null and b/libblkio/libblkio-v1.1.0.tar.bz2 differ

diff --git a/libblkio/libblkio.spec b/libblkio/libblkio.spec
index 922bb63..7f2d3a2 100644 (file)
--- a/libblkio/libblkio.spec
+++ b/libblkio/libblkio.spec
@@ -1,7 +1,6 @@
+Version:       1.1.0
 %global forgeurl https://gitlab.com/libblkio/libblkio
-%global commit c8f5ed9a1460d90a522bda55da09f013fa7da61c
-# Upstream has not tagged any versions so far.
-Version:       0.1
+%global tag    v%{version}
 %forgemeta
 
 Summary:       Block device I/O library
@@ -18,9 +17,18 @@ License:       ASL 2.0 or MIT
 # vendor/concat-idents
 # vendor/io-uring
 # vendor/memfd
+# vendor/num-traits
+# vendor/pci-driver
 # vendor/winapi*
 Source1:       vendor.tar.gz
 
+# Bundled dependencies
+Provides:      bundled(rust-concat-idents)
+Provides:      bundled(rust-io-uring)
+Provides:      bundled(rust-memfd)
+Provides:      bundled(rust-num-traits)
+Provides:      bundled(rust-pci-driver)
+
 # Basic build requirements.
 BuildRequires: gcc, gcc-c++
 BuildRequires: make
@@ -43,7 +51,10 @@ BuildRequires: crate(libc/default)
 BuildRequires: crate(memmap/default)
 BuildRequires: crate(memoffset/default)
 BuildRequires: crate(nix/default)
+# BuildRequires: crate(num-traits/default)
+# BuildRequires: crate(pci-driver/default)
 BuildRequires: crate(proc-macro2/default)
+BuildRequires: crate(quote/default)
 BuildRequires: crate(syn/default)
 BuildRequires: crate(unicode-xid/default)
 BuildRequires: crate(virtio-bindings/default)
@@ -73,6 +84,8 @@ cat >> Cargo.toml <<EOF
 concat-idents = { path = 'vendor/concat-idents' }
 io-uring = { path = 'vendor/io-uring' }
 memfd = { path = 'vendor/memfd' }
+num-traits = { path = 'vendor/num-traits' }
+pci-driver = { path = 'vendor/pci-driver' }
 winapi = { path = 'vendor/winapi' }
 winapi-i686-pc-windows-gnu = { path = 'vendor/winapi-i686-pc-windows-gnu' }
 winapi-x86_64-pc-windows-gnu = { path = 'vendor/winapi-x86_64-pc-windows-gnu' }
@@ -88,16 +101,11 @@ sed -e 's/--locked/--offline/' -i src/cargo-build.sh
 %install
 %{meson_install}
 
-pushd %{buildroot}%{_libdir}
-ln -s libblkio.so libblkio.so.0
-ln -s libblkio.so.0 libblkio.so.0.0
-popd
-
 
 %files
 %license LICENSE-APACHE LICENSE-MIT LICENSE.crosvm
 %doc README.rst
-%{_libdir}/libblkio.so.0*
+%{_libdir}/libblkio.so.1*
 
 
 %files devel
@@ -110,5 +118,5 @@ popd
 
 
 %changelog
-* Tue Sep 06 2022 Richard W.M. Jones <rjones@redhat.com> - 0.1-1
+* Wed Oct 26 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.0-1
 - Initial package

diff --git a/libblkio/vendor.tar.gz b/libblkio/vendor.tar.gz
index c94ea92..0ec8df7 100644 (file)
Binary files a/libblkio/vendor.tar.gz and b/libblkio/vendor.tar.gz differ