diff --git a/.gitignore b/.gitignore index 5edae62..c751ac2 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /image-0.24.4.crate /image-0.24.6.crate /image-0.24.7.crate +/image-0.24.8.crate diff --git a/README.md b/README.md deleted file mode 100644 index e531033..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-image - -The rust-image package \ No newline at end of file diff --git a/image-fix-metadata.diff b/image-fix-metadata.diff index e1faf86..342d080 100644 --- a/image-fix-metadata.diff +++ b/image-fix-metadata.diff @@ -1,16 +1,37 @@ ---- image-0.24.7/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ image-0.24.7/Cargo.toml 2023-08-23T11:36:37.984256+00:00 -@@ -122,9 +122,6 @@ +--- image-0.24.8/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ image-0.24.8/Cargo.toml 2024-01-13T21:34:26.165667+00:00 +@@ -41,20 +41,6 @@ + "--cfg", + "docsrs", + ] +- +-[[bench]] +-name = "decode" +-path = "benches/decode.rs" +-harness = false +- +-[[bench]] +-name = "encode" +-path = "benches/encode.rs" +-harness = false +- +-[[bench]] +-name = "copy_from" +-harness = false + + [dependencies.bytemuck] + version = "1.7.0" +@@ -128,9 +114,6 @@ [dev-dependencies.crc32fast] version = "1.2.0" -[dev-dependencies.criterion] --version = "0.4" +-version = "0.5.0" - [dev-dependencies.glob] version = "0.3" -@@ -169,7 +166,6 @@ +@@ -175,7 +158,6 @@ "dds", "farbfeld", "jpeg_rayon", diff --git a/rust-image.spec b/rust-image.spec index 2af620d..57d45c1 100644 --- a/rust-image.spec +++ b/rust-image.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} %global crate image Name: rust-image -Version: 0.24.7 +Version: 0.24.8 Release: %autorelease Summary: Imaging library @@ -13,11 +13,11 @@ License: MIT URL: https://crates.io/crates/image Source: %{crates_source} # Manually created patch for downstream crate metadata changes -# * drop unused, benchmark-only criterion dev-dependency to speed up builds +# * drop unused, benchmark-only criterion dev-dependency # * disable little-endian-only openexr feature Patch: image-fix-metadata.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Imaging library. Provides basic image processing and encoders/decoders @@ -196,6 +196,18 @@ use the "qoi" feature of the "%{crate}" crate. %files -n %{name}+qoi-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+rayon-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+rayon-devel %{_description} + +This package contains library source intended for building other packages which +use the "rayon" feature of the "%{crate}" crate. + +%files -n %{name}+rayon-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+tga-devel Summary: %{summary} BuildArch: noarch @@ -233,7 +245,7 @@ use the "webp" feature of the "%{crate}" crate. %ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep %generate_buildrequires @@ -248,7 +260,7 @@ use the "webp" feature of the "%{crate}" crate. %if %{with check} %check # * skip tests with missing test files (not included in published crates) -%cargo_test -- -- --skip codecs::bmp::decoder::test::read_rect --skip codecs::png::tests::ensure_no_decoder_off_by_one --skip codecs::png::tests::underlying_error --skip codecs::qoi::tests::decode_test_image --skip dynimage::test::image_dimensions --skip dynimage::test::open_16bpc_png --skip imageops::sample::tests::resize_transparent_image --skip imageops::sample::tests::test_resize_same_size --skip imageops::sample::tests::test_sample_bilinear --skip imageops::sample::tests::test_sample_nearest --skip codecs::bmp::decoder::test::test_no_header +%cargo_test -- -- --exact --skip codecs::bmp::decoder::test::read_rect --skip codecs::png::tests::ensure_no_decoder_off_by_one --skip codecs::png::tests::underlying_error --skip codecs::qoi::tests::decode_test_image --skip dynimage::test::image_dimensions --skip dynimage::test::open_16bpc_png --skip imageops::sample::tests::resize_transparent_image --skip imageops::sample::tests::test_resize_same_size --skip imageops::sample::tests::test_sample_bilinear --skip imageops::sample::tests::test_sample_nearest --skip codecs::bmp::decoder::test::test_no_header %endif %changelog diff --git a/rust2rpm.conf b/rust2rpm.conf deleted file mode 100644 index 3e79f64..0000000 --- a/rust2rpm.conf +++ /dev/null @@ -1,15 +0,0 @@ -[DEFAULT] -unwanted-features = - dav1d - dcv-color-primitives - libwebp - mp4parse - ravif - rgb - avif - avif-decoder - avif-encoder - benchmarks - openexr - webp-encoder - exr diff --git a/rust2rpm.toml b/rust2rpm.toml new file mode 100644 index 0000000..5681597 --- /dev/null +++ b/rust2rpm.toml @@ -0,0 +1,34 @@ +[features] +hide = [ + "dav1d", + "dcv-color-primitives", + "libwebp", + "mp4parse", + "ravif", + "rgb", + "avif", + "avif-decoder", + "avif-encoder", + "benchmarks", + "openexr", + "webp-encoder", + "exr", +] + +[tests] +skip = [ + "codecs::bmp::decoder::test::read_rect", + "codecs::png::tests::ensure_no_decoder_off_by_one", + "codecs::png::tests::underlying_error", + "codecs::qoi::tests::decode_test_image", + "dynimage::test::image_dimensions", + "dynimage::test::open_16bpc_png", + "imageops::sample::tests::resize_transparent_image", + "imageops::sample::tests::test_resize_same_size", + "imageops::sample::tests::test_sample_bilinear", + "imageops::sample::tests::test_sample_nearest", + "codecs::bmp::decoder::test::test_no_header", +] +skip-exact = true +comments = ["skip tests with missing test files (not included in published crates)"] + diff --git a/sources b/sources index 93ebd6f..cb1ce17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (image-0.24.7.crate) = 8c08bb61645a369b5f5713cc296b7de3f245d9b7079801d3cec3d95bd3556d636937898f1bbd1ec18bcba57d4c49f52cf042cbb0244342d030a6dff98c290f6b +SHA512 (image-0.24.8.crate) = 808c25e1b2308b25afa727cf510ee5b5398cc3948e647eea7cd4e651857d158462190a39c2e1d5279c8c7a5144efdcf1943e311504a404d801de76d05692a88e