+Version: 1.2.2
%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
Name: libblkio
-Release: 1%{?dist}
+Release: 12%{?dist}
URL: %{forgeurl}
Source0: %{forgesource}
-License: ASL 2.0 or MIT
-
-# Bundled missing dependencies.
-#
-# These were created by running "cargo vendor" in the source tree
-# and then making a tarball of just the following directories:
-# vendor/concat-idents
-# vendor/io-uring
-# vendor/memfd
-# vendor/winapi*
-Source1: vendor.tar.gz
+License: Apache-2.0 OR MIT
# Basic build requirements.
BuildRequires: gcc, gcc-c++
BuildRequires: cargo
BuildRequires: python3-docutils
BuildRequires: pkgconf
-BuildRequires: crate(autocfg/default)
-BuildRequires: crate(bitflags/default)
-BuildRequires: crate(cc/default)
-BuildRequires: crate(cfg-if/default)
-# BuildRequires: crate(concat-idents...)
-BuildRequires: crate(const-cstr/default)
-# BuildRequires: crate(io-uring...)
-BuildRequires: crate(lazy_static/default)
-BuildRequires: crate(libc/default)
-# BuildRequires: crate(memfd...)
-BuildRequires: crate(memmap/default)
-BuildRequires: crate(memoffset/default)
-BuildRequires: crate(nix/default)
-BuildRequires: crate(proc-macro2/default)
-BuildRequires: crate(syn/default)
-BuildRequires: crate(unicode-xid/default)
-BuildRequires: crate(virtio-bindings/default)
+
+# XXX Eventually use %%generate_buildrequires but it does not support
+# workspaces yet. See
+# https://bugzilla.redhat.com/show_bug.cgi?id=2124697#c57
+#
+# For major version >= 1, we are requiring that the major version does
+# not change.
+#
+# For major version >= 0, we are requiring that the minor version does
+# not change.
+BuildRequires: (crate(autocfg/default) >= 1.0.0 with crate(autocfg/default) < 2.0.0~)
+BuildRequires: (crate(bitflags/default) >= 1.0.0 with crate(bitflags/default) < 2.0.0~)
+BuildRequires: (crate(cc/default) >= 1.0.0 with crate(cc/default) < 2.0.0~)
+BuildRequires: (crate(cfg-if/default) >= 1.0.0 with crate(cfg-if/default) < 2.0.0~)
+BuildRequires: (crate(concat-idents/default) >= 1.0.0 with crate(concat-idents/default) < 2.0.0~)
+BuildRequires: (crate(const-cstr/default) >= 0.3.0 with crate(const-cstr/default) < 0.4.0~)
+BuildRequires: (crate(io-uring/default) >= 0.5.10 with crate(io-uring/default) < 0.6.0~)
+BuildRequires: (crate(lazy_static/default) >= 1.0.0 with crate(lazy_static/default) < 2.0.0~)
+BuildRequires: (crate(libc/default) >= 0.2.134 with crate(libc/default) < 0.3.0~)
+BuildRequires: (crate(memmap2/default) >= 0.5.7 with crate(memmap2/default) < 0.6.0~)
+BuildRequires: (crate(nix/default) >= 0.24.2 with crate(nix/default) < 0.25.0~)
+BuildRequires: (crate(num-traits/default) >= 0.2.15 with crate(num-traits/default) < 0.3.0~)
+BuildRequires: (crate(pci-driver/default) >= 0.1.2 with crate(pci-driver/default) < 0.2.0~)
+BuildRequires: (crate(proc-macro2/default) >= 1.0.0 with crate(proc-macro2/default) < 2.0.0~)
+BuildRequires: (crate(quote/default) >= 1.0.0 with crate(quote/default) < 2.0.0~)
+BuildRequires: (crate(syn/default) >= 1.0.0 with crate(syn/default) < 2.0.0~)
+BuildRequires: (crate(unicode-ident/default) >= 1.0.0 with crate(unicode-ident/default) < 2.0.0~)
+BuildRequires: (crate(virtio-bindings/default) >= 0.1.0 with crate(virtio-bindings/default) < 0.2.0~)
%description
%prep
-%forgesetup
-tar zxf %{SOURCE1}
-
-cat >> Cargo.toml <<EOF
-[patch.crates-io]
-concat-idents = { path = 'vendor/concat-idents' }
-io-uring = { path = 'vendor/io-uring' }
-memfd = { path = 'vendor/memfd' }
-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' }
-EOF
+%forgeautosetup -p1
+
%cargo_prep
-sed -e 's/--locked/--offline/' -i src/cargo-build.sh
+sed -e 's/--locked//' -i src/cargo-build.sh
+
%build
+export RUSTFLAGS="%build_rustflags"
%{meson}
%{meson_build}
%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
%changelog
-* Tue Sep 06 2022 Richard W.M. Jones <rjones@redhat.com> - 0.1-1
+* Wed Jan 11 2023 Richard W.M. Jones <rjones@redhat.com> - 1.2.2-12
- Initial package