Update to version 0.25.5; Fixes RHBZ#2319239

.gitignore

@@ -24,3 +24,8 @@
 /image-0.24.4.crate
 /image-0.24.6.crate
 /image-0.24.7.crate
+/image-0.24.8.crate
+/image-0.24.9.crate
+/image-0.25.1.crate
+/image-0.25.2.crate
+/image-0.25.5.crate

README.md

@@ -1,3 +0,0 @@
-# rust-image
-
-The rust-image package

image-fix-metadata.diff

@@ -1,20 +1,44 @@
---- image-0.24.7/Cargo.toml	1970-01-01T00:00:01+00:00
+--- image-0.25.5/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ image-0.24.7/Cargo.toml	2023-08-23T11:36:37.984256+00:00
++++ image-0.25.5/Cargo.toml	2024-11-16T16:55:51.343632+00:00
-@@ -122,9 +122,6 @@
+@@ -57,31 +57,6 @@
+ name = "image"
+ path = "src/lib.rs"
+ 
+-[[bench]]
+-name = "blur"
+-path = "benches/blur.rs"
+-harness = false
+-
+-[[bench]]
+-name = "copy_from"
+-path = "benches/copy_from.rs"
+-harness = false
+-
+-[[bench]]
+-name = "decode"
+-path = "benches/decode.rs"
+-harness = false
+-
+-[[bench]]
+-name = "encode"
+-path = "benches/encode.rs"
+-harness = false
+-
+-[[bench]]
+-name = "fast_blur"
+-path = "benches/fast_blur.rs"
+-harness = false
+-
+ [dependencies.bytemuck]
+ version = "1.8.0"
+ features = ["extern_crate_alloc"]
+@@ -158,9 +133,6 @@
+ 
  [dev-dependencies.crc32fast]
  version = "1.2.0"
- 
--[dev-dependencies.criterion]
--version = "0.4"
 -
+-[dev-dependencies.criterion]
+-version = "0.5.0"
+ 
  [dev-dependencies.glob]
  version = "0.3"
- 
-@@ -169,7 +166,6 @@
-     "dds",
-     "farbfeld",
-     "jpeg_rayon",
--    "openexr",
-     "qoi",
- ]
- dxt = []

rust-image.spec

@@ -1,23 +1,22 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 26
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate image
 
 Name:           rust-image
-Version:        0.24.7
+Version:        0.25.5
 Release:        %autorelease
 Summary:        Imaging library
 
-License:        MIT
+License:        MIT OR Apache-2.0
 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
@@ -35,7 +34,8 @@ This package contains library source intended for building other packages which
 use the "%{crate}" crate.
 
 %files          devel
-%license %{crate_instdir}/LICENSE
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-MIT
 %doc %{crate_instdir}/CHANGES.md
 %doc %{crate_instdir}/README.md
 %{crate_instdir}/
@@ -52,6 +52,18 @@ use the "default" feature of the "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{crate_instdir}/Cargo.toml
 
+%package     -n %{name}+avif-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+avif-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "avif" feature of the "%{crate}" crate.
+
+%files       -n %{name}+avif-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %package     -n %{name}+bmp-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -64,6 +76,18 @@ use the "bmp" feature of the "%{crate}" crate.
 %files       -n %{name}+bmp-devel
 %ghost %{crate_instdir}/Cargo.toml
 
+%package     -n %{name}+color_quant-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+color_quant-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "color_quant" feature of the "%{crate}" crate.
+
+%files       -n %{name}+color_quant-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %package     -n %{name}+dds-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -76,28 +100,40 @@ use the "dds" feature of the "%{crate}" crate.
 %files       -n %{name}+dds-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+dxt-devel
+%package     -n %{name}+default-formats-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+default-formats-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "default-formats" feature of the "%{crate}" crate.
+
+%files       -n %{name}+default-formats-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+exr-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+dxt-devel %{_description}
+%description -n %{name}+exr-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "dxt" feature of the "%{crate}" crate.
+use the "exr" feature of the "%{crate}" crate.
 
-%files       -n %{name}+dxt-devel
+%files       -n %{name}+exr-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+farbfeld-devel
+%package     -n %{name}+ff-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+farbfeld-devel %{_description}
+%description -n %{name}+ff-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "farbfeld" feature of the "%{crate}" crate.
+use the "ff" feature of the "%{crate}" crate.
 
-%files       -n %{name}+farbfeld-devel
+%files       -n %{name}+ff-devel
 %ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+gif-devel
@@ -148,16 +184,16 @@ use the "jpeg" feature of the "%{crate}" crate.
 %files       -n %{name}+jpeg-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+jpeg_rayon-devel
+%package     -n %{name}+nasm-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+jpeg_rayon-devel %{_description}
+%description -n %{name}+nasm-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "jpeg_rayon" feature of the "%{crate}" crate.
+use the "nasm" feature of the "%{crate}" crate.
 
-%files       -n %{name}+jpeg_rayon-devel
+%files       -n %{name}+nasm-devel
 %ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+png-devel
@@ -196,6 +232,30 @@ 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}+serde-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+serde-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "serde" feature of the "%{crate}" crate.
+
+%files       -n %{name}+serde-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %package     -n %{name}+tga-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -233,7 +293,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
@@ -247,8 +307,8 @@ use the "webp" feature of the "%{crate}" crate.
 
 %if %{with check}
 %check
-# * skip tests with missing test files (not included in published crates)
+# * skip tests that require files which are 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::bmp::decoder::test::test_no_header --skip codecs::jpeg::decoder::tests::test_exif_orientation --skip codecs::openexr::test::compare_cropped --skip codecs::openexr::test::compare_exr_hdr --skip codecs::openexr::test::compare_rgba_rgb --skip codecs::png::tests::ensure_no_decoder_off_by_one --skip codecs::png::tests::underlying_error --skip codecs::qoi::tests::decode_test_image --skip codecs::tga::encoder::tests::compressed::round_trip_bw --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 imageops::tests::fast_blur_approximates_gaussian_blur_well
 %endif
 
 %changelog

rust2rpm.conf

@@ -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

rust2rpm.toml

@@ -0,0 +1,37 @@
+[package]
+cargo-toml-patch-comments = [
+    "drop unused, benchmark-only criterion dev-dependency",
+]
+
+[features]
+hide = [
+    "benchmarks",
+    # missing dependency: mp4parse ^0.17
+    "avif-native",
+]
+
+[tests]
+skip = [
+    "codecs::bmp::decoder::test::read_rect",
+    "codecs::bmp::decoder::test::test_no_header",
+    "codecs::jpeg::decoder::tests::test_exif_orientation",
+    "codecs::openexr::test::compare_cropped",
+    "codecs::openexr::test::compare_exr_hdr",
+    "codecs::openexr::test::compare_rgba_rgb",
+    "codecs::png::tests::ensure_no_decoder_off_by_one",
+    "codecs::png::tests::underlying_error",
+    "codecs::qoi::tests::decode_test_image",
+    "codecs::tga::encoder::tests::compressed::round_trip_bw",
+    "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",
+    "imageops::tests::fast_blur_approximates_gaussian_blur_well",
+]
+skip-exact = true
+comments = [
+    "skip tests that require files which are not included in published crates",
+]
+

sources

@@ -1 +1 @@
-SHA512 (image-0.24.7.crate) = 8c08bb61645a369b5f5713cc296b7de3f245d9b7079801d3cec3d95bd3556d636937898f1bbd1ec18bcba57d4c49f52cf042cbb0244342d030a6dff98c290f6b
+SHA512 (image-0.25.5.crate) = e43cf4def78b47d337594ef1729668b1f88e6432c23bbedf0f89879121dc0e22554f4e590999332cf344516d6f8fa3d3fc874c1860ca36556c32f6b37df3f06a