X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libblkio%2Flibblkio.spec;h=213f2b484d21f88950f89e6791b1fa6d83131f8e;hb=e3b22cccd6a32642642532287c052eac4c1ff1d4;hp=a875bd9d1a8cbaa9d5c4bc4cc7f4d50539716c2c;hpb=bb8397d09d3b662fc8b61b65b9083a5aad0518c1;p=fedora-reviews.git

diff --git a/libblkio/libblkio.spec b/libblkio/libblkio.spec
index a875bd9..213f2b4 100644
--- a/libblkio/libblkio.spec
+++ b/libblkio/libblkio.spec
@@ -1,26 +1,14 @@
-Version:       1.1.0
+Version:       1.2.2
 %global forgeurl https://gitlab.com/libblkio/libblkio
 %global tag    v%{version}
 %forgemeta
 
 Summary:       Block device I/O library
 Name:          libblkio
-Release:       4%{?dist}
+Release:       12%{?dist}
 URL:           %{forgeurl}
 Source0:       %{forgesource}
-License:       ASL 2.0 or MIT
-
-Patch:         0001-Use-io-uring-0.5.8.patch
-
-# 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/memfd
-Source1:       vendor.tar.gz
-
-# Bundled dependencies
-Provides:      bundled(crate(memfd/default)) = 0.4.1
+License:       Apache-2.0 OR MIT
 
 # Basic build requirements.
 BuildRequires: gcc, gcc-c++
@@ -31,26 +19,34 @@ BuildRequires: rustfmt
 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/default)
-BuildRequires: crate(const-cstr/default)
-BuildRequires: crate(io-uring/default)
-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(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)
+
+# 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
@@ -70,16 +66,13 @@ This package contains development tools for %{name}.
 
 %prep
 %forgeautosetup -p1
-tar zxf %{SOURCE1}
 
-cat >> Cargo.toml <<EOF
-[patch.crates-io]
-memfd = { path = 'vendor/memfd' }
-EOF
 %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}
 
@@ -91,7 +84,7 @@ sed -e 's/--locked/--offline/' -i src/cargo-build.sh
 %files
 %license LICENSE-APACHE LICENSE-MIT LICENSE.crosvm
 %doc README.rst
-%{_libdir}/libblkio.so.1*
+%{_libdir}/libblkio.so.1{,.*}
 
 
 %files devel
@@ -104,5 +97,5 @@ sed -e 's/--locked/--offline/' -i src/cargo-build.sh
 
 
 %changelog
-* Mon Oct 31 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.0-4
+* Wed Jan 11 2023 Richard W.M. Jones <rjones@redhat.com> - 1.2.2-12
 - Initial package