diff --git a/.gitignore b/.gitignore index b4d589c..8834c69 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /zip-0.5.11.crate /zip-0.5.12.crate /zip-0.5.13.crate +/zip-0.6.4.crate diff --git a/README.md b/README.md deleted file mode 100644 index 760766e..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-zip - -The rust-zip package \ No newline at end of file diff --git a/rust-zip.spec b/rust-zip.spec index cc1bc38..9614c53 100644 --- a/rust-zip.spec +++ b/rust-zip.spec @@ -1,25 +1,23 @@ -# Generated by rust2rpm 17 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate zip -Name: rust-%{crate} -Version: 0.5.13 +Name: rust-zip +Version: 0.6.4 Release: %autorelease Summary: Library to support the reading and writing of zip files -# Upstream license specification: MIT License: MIT URL: https://crates.io/crates/zip Source: %{crates_source} +# Manually created patch for downstream crate metadata changes +# * bump constant_time_eq dependency from 0.1 to 0.2 +# * bump zstd dependency from 0.11 to 0.12 +Patch: zip-fix-metadata.diff -ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Library to support the reading and writing of zip files.} @@ -32,13 +30,15 @@ BuildArch: noarch %description devel %{_description} -This package contains library source intended for building other packages -which use "%{crate}" crate. +This package contains library source intended for building other packages which +use the "%{crate}" crate. %files devel -%license LICENSE -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE +%doc %{crate_instdir}/CHANGELOG.md +%doc %{crate_instdir}/CODE_OF_CONDUCT.md +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -46,11 +46,35 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} -This package contains library source intended for building other packages -which use "default" feature of "%{crate}" crate. +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}+aes-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+aes-devel %{_description} + +This package contains library source intended for building other packages which +use the "aes" feature of the "%{crate}" crate. + +%files -n %{name}+aes-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+aes-crypto-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+aes-crypto-devel %{_description} + +This package contains library source intended for building other packages which +use the "aes-crypto" feature of the "%{crate}" crate. + +%files -n %{name}+aes-crypto-devel +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+bzip2-devel Summary: %{summary} @@ -58,11 +82,23 @@ BuildArch: noarch %description -n %{name}+bzip2-devel %{_description} -This package contains library source intended for building other packages -which use "bzip2" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "bzip2" feature of the "%{crate}" crate. %files -n %{name}+bzip2-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+constant_time_eq-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+constant_time_eq-devel %{_description} + +This package contains library source intended for building other packages which +use the "constant_time_eq" feature of the "%{crate}" crate. + +%files -n %{name}+constant_time_eq-devel +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+deflate-devel Summary: %{summary} @@ -70,11 +106,11 @@ BuildArch: noarch %description -n %{name}+deflate-devel %{_description} -This package contains library source intended for building other packages -which use "deflate" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "deflate" feature of the "%{crate}" crate. %files -n %{name}+deflate-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+deflate-miniz-devel Summary: %{summary} @@ -82,11 +118,11 @@ BuildArch: noarch %description -n %{name}+deflate-miniz-devel %{_description} -This package contains library source intended for building other packages -which use "deflate-miniz" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "deflate-miniz" feature of the "%{crate}" crate. %files -n %{name}+deflate-miniz-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+deflate-zlib-devel Summary: %{summary} @@ -94,11 +130,11 @@ BuildArch: noarch %description -n %{name}+deflate-zlib-devel %{_description} -This package contains library source intended for building other packages -which use "deflate-zlib" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "deflate-zlib" feature of the "%{crate}" crate. %files -n %{name}+deflate-zlib-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+flate2-devel Summary: %{summary} @@ -106,11 +142,47 @@ BuildArch: noarch %description -n %{name}+flate2-devel %{_description} -This package contains library source intended for building other packages -which use "flate2" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "flate2" feature of the "%{crate}" crate. %files -n %{name}+flate2-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+hmac-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+hmac-devel %{_description} + +This package contains library source intended for building other packages which +use the "hmac" feature of the "%{crate}" crate. + +%files -n %{name}+hmac-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+pbkdf2-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+pbkdf2-devel %{_description} + +This package contains library source intended for building other packages which +use the "pbkdf2" feature of the "%{crate}" crate. + +%files -n %{name}+pbkdf2-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+sha1-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+sha1-devel %{_description} + +This package contains library source intended for building other packages which +use the "sha1" feature of the "%{crate}" crate. + +%files -n %{name}+sha1-devel +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+time-devel Summary: %{summary} @@ -118,11 +190,11 @@ BuildArch: noarch %description -n %{name}+time-devel %{_description} -This package contains library source intended for building other packages -which use "time" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "time" feature of the "%{crate}" crate. %files -n %{name}+time-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+unreserved-devel Summary: %{summary} @@ -130,11 +202,23 @@ BuildArch: noarch %description -n %{name}+unreserved-devel %{_description} -This package contains library source intended for building other packages -which use "unreserved" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "unreserved" feature of the "%{crate}" crate. %files -n %{name}+unreserved-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+zstd-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+zstd-devel %{_description} + +This package contains library source intended for building other packages which +use the "zstd" feature of the "%{crate}" crate. + +%files -n %{name}+zstd-devel +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/sources b/sources index 47e14fc..dc0b35c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zip-0.5.13.crate) = b30950ede91cdb1d4ef4f9d6aee8f62a3aa5a1a6422bd10507dfd76edc02c1bd24d41c7bf2ac416a5ee045562cacda0d17cd04938ec02b8be0a0d64acbaf7e01 +SHA512 (zip-0.6.4.crate) = 29392175711fb8585d400f99798596e10415423b3fda245069ca3144bce4b1027db845526c233bcf8be13b756e9605df21657bd2b5713339adeb334fe964ff8e diff --git a/zip-fix-metadata.diff b/zip-fix-metadata.diff new file mode 100644 index 0000000..ff68961 --- /dev/null +++ b/zip-fix-metadata.diff @@ -0,0 +1,20 @@ +--- zip-0.6.4/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ zip-0.6.4/Cargo.toml 2023-04-15T11:49:45.631984+00:00 +@@ -49,7 +49,7 @@ + optional = true + + [dependencies.constant_time_eq] +-version = "0.1.5" ++version = "0.2" + optional = true + + [dependencies.crc32fast] +@@ -80,7 +80,7 @@ + default-features = false + + [dependencies.zstd] +-version = "0.11.2" ++version = "0.12" + optional = true + + [dev-dependencies.bencher]