diff --git a/.gitignore b/.gitignore index a02e0e9..cf3a2f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /bzip2-sys-0.1.9+1.0.8.crate +/bzip2-sys-0.1.10+1.0.8.crate diff --git a/.rust2rpm.conf b/.rust2rpm.conf new file mode 100644 index 0000000..dc5ddb9 --- /dev/null +++ b/.rust2rpm.conf @@ -0,0 +1,5 @@ +[DEFAULT] +buildrequires = + pkgconfig(bzip2) +lib.requires = + pkgconfig(bzip2) diff --git a/bzip2-sys-fix-metadata.diff b/bzip2-sys-fix-metadata.diff new file mode 100644 index 0000000..522b479 --- /dev/null +++ b/bzip2-sys-fix-metadata.diff @@ -0,0 +1,11 @@ +--- bzip2-sys-0.1.10+1.0.8/Cargo.toml 2021-02-01T19:07:44+00:00 ++++ bzip2-sys-0.1.10+1.0.8/Cargo.toml 2021-02-08T19:54:16.676915+00:00 +@@ -12,7 +12,7 @@ + + [package] + name = "bzip2-sys" +-version = "0.1.10+1.0.8" ++version = "0.1.10" + authors = ["Alex Crichton "] + build = "build.rs" + links = "bzip2" diff --git a/rust-bzip2-sys.spec b/rust-bzip2-sys.spec index 09d1666..97ff500 100644 --- a/rust-bzip2-sys.spec +++ b/rust-bzip2-sys.spec @@ -1,18 +1,22 @@ -# Generated by rust2rpm 13 +# Generated by rust2rpm 16 %bcond_without check %global debug_package %{nil} %global crate bzip2-sys +%global upstream_version 0.1.10+1.0.8 Name: rust-%{crate} -Version: 0.1.9+1.0.8 -Release: 4%{?dist} -Summary: Bindings to libbzip2 for bzip2 compression and decompression exposed as Reader/Writer streams +Version: 0.1.10 +Release: 1%{?dist} +Summary: Bindings to libbzip2 for bzip2 exposed as Reader/Writer streams # Upstream license specification: MIT/Apache-2.0 License: MIT or ASL 2.0 URL: https://crates.io/crates/bzip2-sys -Source: %{crates_source} +Source: %{crates_source %{crate} %{upstream_version}} +# Initial patched metadata +# * remove bzip2 version suffix +Patch0: bzip2-sys-fix-metadata.diff ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} @@ -20,7 +24,6 @@ BuildArch: noarch %endif BuildRequires: rust-packaging -BuildRequires: pkgconfig(bzip2) %global _description %{expand: Bindings to libbzip2 for bzip2 compression and decompression exposed as @@ -39,9 +42,7 @@ This package contains library source intended for building other packages which use "%{crate}" crate. %files devel -# license texts currently only available for bzip2-rs, -# not for bzip2-rs/bzip2-sys -# see https://github.com/alexcrichton/bzip2-rs/pull/59 +%license LICENSE-APACHE LICENSE-MIT %{cargo_registry}/%{crate}-%{version_no_tilde}/ %package -n %{name}+default-devel @@ -57,13 +58,14 @@ which use "default" feature of "%{crate}" crate. %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{upstream_version} -p1 # remove the bundled copy to make sure we're linking against the system lib rm -vr bzip2-1.0.8 %cargo_prep %generate_buildrequires %cargo_generate_buildrequires +echo 'pkgconfig(bzip2)' %build %cargo_build @@ -77,6 +79,10 @@ rm -vr bzip2-1.0.8 %endif %changelog +* Mon Feb 08 2021 Fabio Valentini - 0.1.10-1 +- Update to version 0.1.10. +- Fixes RHBZ#1923764 + * Wed Jan 27 2021 Fedora Release Engineering - 0.1.9+1.0.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 89eb01b..41e0333 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bzip2-sys-0.1.9+1.0.8.crate) = 069ff0c16f61f6c2b58fbbe11896130c666960926dc12a08e5db64073625b02f4e9628da52cc46fb2ef11ac8ac4268c735d6f37378e9eed1e2b258d5cd235145 +SHA512 (bzip2-sys-0.1.10+1.0.8.crate) = 1f730176812669fdd9fb79e36c03db2e6270f107fcc4f63f84cfc1084cb78a5c0ee3f0659397e5b42b626629a42c0da7805fb3f5311719e45422ec8b0745851b