From 34760994b6218826a32622ebec678c701d09e1e0 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 31 Mar 2022 11:23:07 +0200 Subject: [PATCH] Update to version 1.1.5; Fixes RHBZ#2061218 --- .gitignore | 1 + libz-sys-fix-metadata.diff | 6 +++--- rust-libz-sys.spec | 38 ++++++++++++++++++-------------------- sources | 2 +- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 1105c98..87d81fb 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /libz-sys-1.1.0.crate /libz-sys-1.1.2.crate /libz-sys-1.1.3.crate +/libz-sys-1.1.5.crate diff --git a/libz-sys-fix-metadata.diff b/libz-sys-fix-metadata.diff index 3283f45..bb24883 100644 --- a/libz-sys-fix-metadata.diff +++ b/libz-sys-fix-metadata.diff @@ -1,6 +1,6 @@ ---- libz-sys-1.1.3/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ libz-sys-1.1.3/Cargo.toml 2021-04-30T10:29:37.030059+00:00 -@@ -28,18 +28,9 @@ +--- libz-sys-1.1.5/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ libz-sys-1.1.5/Cargo.toml 2022-03-31T09:21:24.052708+00:00 +@@ -27,18 +27,9 @@ [build-dependencies.cc] version = "1.0.18" diff --git a/rust-libz-sys.spec b/rust-libz-sys.spec index b2a9cab..33f402d 100644 --- a/rust-libz-sys.spec +++ b/rust-libz-sys.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 17 +# Generated by rust2rpm 21 %bcond_without check %global debug_package %{nil} %global crate libz-sys Name: rust-%{crate} -Version: 1.1.3 +Version: 1.1.5 Release: %autorelease Summary: Low-level bindings to the system libz library (also known as zlib) @@ -19,11 +19,8 @@ Source: %{crates_source} Patch0: libz-sys-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Low-level bindings to the system libz library (also known as zlib).} @@ -37,13 +34,14 @@ Requires: pkgconfig(zlib) %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-MIT LICENSE-APACHE -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -51,11 +49,11 @@ 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}+libc-devel Summary: %{summary} @@ -63,11 +61,11 @@ 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. +This package contains library source intended for building other packages which +use the "libc" feature of the "%{crate}" crate. %files -n %{name}+libc-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+stock-zlib-devel Summary: %{summary} @@ -75,11 +73,11 @@ 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. +This package contains library source intended for building other packages which +use the "stock-zlib" feature of the "%{crate}" crate. %files -n %{name}+stock-zlib-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 de0205a..cded9cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libz-sys-1.1.3.crate) = 9ad3ac88cb3c436ba046a55123b7a3c96c56a8ae2a1b85a3eb39339e84441b16c82d35630e9aad1d51db83943f2d08cf0bd45e212b7284c224de451a0f0c30bb +SHA512 (libz-sys-1.1.5.crate) = 51ac64c26df57d91f4b7e089600e283354ebf636d8a50ff530ddb031ad0eb74601aca687a087f9e7f51f2b00187d8daa03ca2999ea48ea274c87ad8c7ba8d9ac