diff --git a/.gitignore b/.gitignore index d2e6a0b..b178d8e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /libz-sys-1.0.23.crate /libz-sys-1.0.24.crate /libz-sys-1.0.25.crate +/libz-sys-1.1.0.crate diff --git a/libz-sys-fix-metadata.diff b/libz-sys-fix-metadata.diff index 08e7475..1130181 100644 --- a/libz-sys-fix-metadata.diff +++ b/libz-sys-fix-metadata.diff @@ -1,8 +1,21 @@ ---- libz-sys-1.0.25/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ libz-sys-1.0.25/Cargo.toml 2019-06-20T10:34:11.327023+00:00 -@@ -32,5 +32,3 @@ +--- libz-sys-1.1.0/Cargo.toml 2020-08-18T04:17:58+00:00 ++++ libz-sys-1.1.0/Cargo.toml 2020-08-19T23:56:17.920781+00:00 +@@ -28,18 +28,9 @@ + [build-dependencies.cc] + version = "1.0.18" + +-[build-dependencies.cmake] +-version = "0.1.44" +-optional = true +- + [build-dependencies.pkg-config] + version = "0.3.9" + [features] - asm = [] - static = [] +-asm = [] + default = ["libc", "stock-zlib"] +-static = [] + stock-zlib = [] +-zlib-ng = ["libc", "cmake"] -[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] -version = "0.2" diff --git a/rust-libz-sys.spec b/rust-libz-sys.spec index de20201..5a54a2d 100644 --- a/rust-libz-sys.spec +++ b/rust-libz-sys.spec @@ -1,20 +1,21 @@ -# Generated by rust2rpm 10 +# Generated by rust2rpm 13 %bcond_without check %global debug_package %{nil} %global crate libz-sys Name: rust-%{crate} -Version: 1.0.25 -Release: 8%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Bindings to the system libz library (also known as zlib) -# Upstream license specification: MIT/Apache-2.0 +# Upstream license specification: MIT OR Apache-2.0 License: MIT or ASL 2.0 URL: https://crates.io/crates/libz-sys Source: %{crates_source} # Initial patched metadata # * No MSVC +# * Remove asm/static/zlib-ng features Patch0: libz-sys-fix-metadata.diff ExclusiveArch: %{rust_arches} @@ -42,7 +43,7 @@ which use "%{crate}" crate. %files devel %license LICENSE-MIT LICENSE-APACHE %doc README.md -%{cargo_registry}/%{crate}-%{version}/ +%{cargo_registry}/%{crate}-%{version_no_tilde}/ %package -n %{name}+default-devel Summary: %{summary} @@ -54,12 +55,37 @@ This package contains library source intended for building other packages which use "default" feature of "%{crate}" crate. %files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+libc-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+libc-devel %{_description} + +This package contains library source intended for building other packages +which use "libc" feature of "%{crate}" crate. + +%files -n %{name}+libc-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+stock-zlib-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+stock-zlib-devel %{_description} + +This package contains library source intended for building other packages +which use "stock-zlib" feature of "%{crate}" crate. + +%files -n %{name}+stock-zlib-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 # No bundled libs rm -vrf src/zlib/ +rm -vrf src/zlib-ng/ %cargo_prep %generate_buildrequires @@ -78,6 +104,9 @@ echo 'pkgconfig(zlib)' %endif %changelog +* Wed Aug 19 2020 Josh Stone - 1.1.0-1 +- Update to 1.1.0 + * Wed Jul 29 2020 Fedora Release Engineering - 1.0.25-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index a4e164d..94b5d2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libz-sys-1.0.25.crate) = 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547 +SHA512 (libz-sys-1.1.0.crate) = 2d7ca1dc376d77c8b4b764d02bb6371c72ab6f07def5f50b22d77d19631e5a1f67d2e1a51c4cf7766fb365cda2286692181c6a05f55126404033347f307b9283