Update to version 3.2.0; Fixes RHBZ#2229769

dolby_vision-fix-metadata.diff

@@ -0,0 +1,24 @@
+--- dolby_vision-3.2.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ dolby_vision-3.2.0/Cargo.toml	2023-08-27T14:45:23.250385+00:00
+@@ -39,10 +39,7 @@
+ 
+ [lib]
+ doctest = false
+-
+-[[bench]]
+-name = "bench_main"
+-harness = false
++crate-type = ["lib", "cdylib"]
+ 
+ [dependencies.anyhow]
+ version = "1.0.72"
+@@ -76,9 +73,6 @@
+ features = ["preserve_order"]
+ optional = true
+ 
+-[dev-dependencies.criterion]
+-version = "0.5.1"
+-
+ [features]
+ capi = ["libc"]
+ serde = [

rust-dolby_vision-deps.patch

@@ -1,13 +0,0 @@
-diff -up dolby_vision-3.1.2/Cargo.toml.orig dolby_vision-3.1.2/Cargo.toml
---- dolby_vision-3.1.2/Cargo.toml.orig	1970-01-01 01:00:01.000000000 +0100
-+++ dolby_vision-3.1.2/Cargo.toml	2023-06-21 10:53:53.100347261 +0200
-@@ -76,9 +76,6 @@ version = "1.0.93"
- features = ["preserve_order"]
- optional = true
- 
--[dev-dependencies.criterion]
--version = "0.4.0"
--
- [features]
- capi = ["libc"]
- serde = [

rust-dolby_vision.spec

@@ -1,26 +1,63 @@
 # Generated by rust2rpm 24
 %bcond_without check
-%global debug_package %{nil}
 
 %global crate dolby_vision
 
 Name:           rust-dolby_vision
-Version:        3.1.2
+Version:        3.2.0
 Release:        %autorelease
 Summary:        Dolby Vision metadata parsing and writing
 
 License:        MIT
 URL:            https://crates.io/crates/dolby_vision
 Source:         %{crates_source}
-Patch:          %{name}-deps.patch
+# Manually created patch for downstream crate metadata changes
+# * drop unused, benchmark-only criterion dev-dependency to speed up builds
+# * explicitly mark library as a "cdylib" type to fix spec generation
+Patch:          dolby_vision-fix-metadata.diff
 
 BuildRequires:  cargo-rpm-macros >= 24
+BuildRequires:  cargo-c
 
 %global _description %{expand:
 Dolby Vision metadata parsing and writing.}
 
 %description %{_description}
 
+%package     -n libdovi
+Summary:        %{summary}
+# Apache-2.0 OR BSL-1.0
+# Apache-2.0 OR MIT
+# MIT
+# MIT OR Apache-2.0
+License:        MIT AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT)
+# LICENSE.dependencies contains a full license breakdown
+
+%description -n libdovi %{_description}
+
+This package contains the C library.
+
+%files       -n libdovi
+%license LICENSE
+%license LICENSE.dependencies
+%doc CHANGELOG.md
+%doc README.md
+%{_libdir}/libdovi.so.3{,.*}
+
+%package     -n libdovi-devel
+Summary:        %{summary}
+Requires:       libdovi%{?_isa} = %{version}-%{release}
+
+%description -n libdovi-devel %{_description}
+
+This package contains the C library development files.
+
+%files       -n libdovi-devel
+%{_libdir}/libdovi.so
+%{_libdir}/pkgconfig/dovi.pc
+%dir %{_includedir}/libdovi
+%{_includedir}/libdovi/rpu_parser.h
+
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -108,74 +145,29 @@ use the "xml" feature of the "%{crate}" crate.
 %files       -n %{name}+xml-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n libdovi
-Summary:        %{summary}
-BuildRequires:  cargo-c
-BuildRequires:  rust-indexmap-devel
-BuildRequires:  rust-roxmltree-devel
-
-%description -n libdovi %{_description}
-
-This package contains the C library.
-
-%package     -n libdovi-devel
-Summary:        %{summary}
-Requires:       libdovi%{_isa} = %{version}-%{release}
-
-%description -n libdovi-devel %{_description}
-
-This package contains the C library development files.
-
-
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
 %cargo_prep
 
 %generate_buildrequires
-%cargo_generate_buildrequires
 %cargo_generate_buildrequires -a
-echo "cargo-c"
 
 %build
-%cargo_build
+%cargo_build -a
-%{__cargo} cbuild \
+%cargo_cbuild --all-features
-  %{__cargo_common_opts} \
+%{cargo_license_summary -a}
-  --release \
+%{cargo_license -a} > LICENSE.dependencies
-  --library-type=cdylib \
-  --destdir=%{buildroot} \
-  --prefix=%{_prefix} \
-  --includedir=%{_includedir} \
-  --libdir=%{_libdir} \
-
 
 %install
-%cargo_install
+%cargo_install -a
-%{__cargo} cinstall \
+%cargo_cinstall --all-features
-  %{?_smp_mflags} \
+rm %{buildroot}/%{_libdir}/libdovi.a
-  --release \
-  --library-type=cdylib \
-  --destdir=%{buildroot} \
-  --prefix=%{_prefix} \
-  --includedir=%{_includedir} \
-  --libdir=%{_libdir} \
-
 
 %if %{with check}
 %check
-%cargo_test
+# * skip tests that require files that are not included in published crates
+%cargo_test -a -- -- --skip rpu::generate::tests::config_with_frame_edits --skip xml::tests::parse
 %endif
 
-%files -n libdovi-devel
-%doc examples README.md
-%{_libdir}/libdovi.so
-%{_libdir}/pkgconfig/dovi.pc
-%dir %{_includedir}/libdovi
-%{_includedir}/libdovi/rpu_parser.h
-
-%files -n libdovi
-%license LICENSE
-%doc CHANGELOG.md
-%{_libdir}/libdovi.so.3{,.*}
-
 %changelog
 %autochangelog

rust2rpm.conf

@@ -0,0 +1,2 @@
+[DEFAULT]
+all-features = true

sources

@@ -1 +1 @@
-SHA512 (dolby_vision-3.1.2.crate) = 00047358237d284b9c0d144b5edf3fac83a1273bf7b2cd658bf3bcd8634358c3a2d026fcb4e49247b7c74be127a06a8b0c142d72dfbfc363a974007c1552bca4
+SHA512 (dolby_vision-3.2.0.crate) = 191d103aa52a5a1330b290145218420f4ff26b2772b4812873b6b455c6b976a3e2bdfb7195943dec0d58515ad338d42451fd4b8563e653ce5e49556c90e1bd2e