diff --git a/.gitignore b/.gitignore index 9228586..aa7ea9e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /trash-2.0.2.crate /trash-2.0.3.crate /trash-2.0.4.crate +/trash-2.1.1.crate diff --git a/rust-trash.spec b/rust-trash.spec index 41cb3c4..ff0e811 100644 --- a/rust-trash.spec +++ b/rust-trash.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 20 +# Generated by rust2rpm 21 # * tests require an existing trash folder %bcond_with check %global debug_package %{nil} @@ -6,7 +6,7 @@ %global crate trash Name: rust-%{crate} -Version: 2.0.4 +Version: 2.1.1 Release: %autorelease Summary: Library for moving files and folders to the Recycle Bin @@ -20,7 +20,7 @@ Patch0: trash-fix-metadata.diff ExclusiveArch: %{rust_arches} -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Library for moving files and folders to the Recycle Bin.} @@ -37,9 +37,10 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel -%license LICENSE.txt -%doc CHANGELOG.md README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE.txt +%doc %{crate_instdir}/CHANGELOG.md +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -51,7 +52,7 @@ This package contains library source intended for building other packages which use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+coinit_apartmentthreaded-devel Summary: %{summary} @@ -63,7 +64,7 @@ This package contains library source intended for building other packages which use the "coinit_apartmentthreaded" feature of the "%{crate}" crate. %files -n %{name}+coinit_apartmentthreaded-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+coinit_disable_ole1dde-devel Summary: %{summary} @@ -75,7 +76,7 @@ This package contains library source intended for building other packages which use the "coinit_disable_ole1dde" feature of the "%{crate}" crate. %files -n %{name}+coinit_disable_ole1dde-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+coinit_multithreaded-devel Summary: %{summary} @@ -87,7 +88,7 @@ This package contains library source intended for building other packages which use the "coinit_multithreaded" feature of the "%{crate}" crate. %files -n %{name}+coinit_multithreaded-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+coinit_speed_over_memory-devel Summary: %{summary} @@ -99,7 +100,7 @@ This package contains library source intended for building other packages which use the "coinit_speed_over_memory" feature of the "%{crate}" crate. %files -n %{name}+coinit_speed_over_memory-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/sources b/sources index e4a1426..1d493b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (trash-2.0.4.crate) = 17746b98f43045ff105d38a049e6d60a878b25686e6ecb3cc22c9b1ca876ec608e1fa7f0b4af9df68635b71ea00d0cac5d07606662c9bd2b6295ddc2c4972b61 +SHA512 (trash-2.1.1.crate) = 763bd8fa5518e2d0f84051e0c4fa7f94d8610ac3d7728432651de27844c2650f82142496000bc7b6ff2e23eb349de113505e3ea0e19f41aedc822345f8952d2e diff --git a/trash-fix-metadata.diff b/trash-fix-metadata.diff index 1ae64ed..100c7b3 100644 --- a/trash-fix-metadata.diff +++ b/trash-fix-metadata.diff @@ -1,22 +1,26 @@ ---- trash-2.0.4/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ trash-2.0.4/Cargo.toml 2022-01-26T16:39:38.975266+00:00 -@@ -33,8 +33,6 @@ +--- trash-2.1.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ trash-2.1.1/Cargo.toml 2022-05-11T13:49:51.106468+00:00 +@@ -51,9 +51,6 @@ + [dev-dependencies.serial_test] + version = "0.6.0" - [dev-dependencies.rand] - version = "0.8.3" -[build-dependencies.windows] -version = "0.9.0" - +- [features] coinit_apartmentthreaded = [] -@@ -56,12 +54,3 @@ + coinit_disable_ole1dde = [] +@@ -75,15 +72,3 @@ [target."cfg(all(unix, not(target_os = \"macos\"), not(target_os = \"ios\"), not(target_os = \"android\")))".dependencies.url] version = "2.1.0" +- -[target."cfg(any(target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies.once_cell] -version = "1.7.2" +- -[target."cfg(target_os = \"macos\")".dependencies.objc] -version = "0.2.7" +- -[target."cfg(windows)".dependencies.scopeguard] -version = "1.0.0" -