diff --git a/.gitignore b/.gitignore index fd17e73..8729992 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /*.src.rpm /bitvec-0.19.4.crate +/bitvec-0.19.6.crate diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..467fbd9 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2018 myrrlyn (Alexander Payne) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/bitvec-fix-metadata.diff b/bitvec-fix-metadata.diff index 993fd41..06cfc24 100644 --- a/bitvec-fix-metadata.diff +++ b/bitvec-fix-metadata.diff @@ -1,5 +1,5 @@ ---- bitvec-0.19.4/Cargo.toml 2020-10-26T22:34:28+00:00 -+++ bitvec-0.19.4/Cargo.toml 2020-11-24T11:35:30.427497+00:00 +--- bitvec-0.19.6/Cargo.toml 2021-11-21T00:36:11+00:00 ++++ bitvec-0.19.6/Cargo.toml 2022-11-04T17:18:00.030643+00:00 @@ -35,7 +35,7 @@ default-features = false @@ -9,3 +9,12 @@ [dependencies.serde] version = "1" +@@ -48,8 +48,6 @@ + [dependencies.wyz] + version = "0.2" + default-features = false +-[dev-dependencies.criterion] +-version = "0.3" + + [dev-dependencies.serde] + version = "1" diff --git a/rust-bitvec.spec b/rust-bitvec.spec index 0501597..70227e6 100644 --- a/rust-bitvec.spec +++ b/rust-bitvec.spec @@ -1,22 +1,23 @@ -# Generated by rust2rpm 16 +# Generated by rust2rpm 23 %bcond_without check %global debug_package %{nil} %global crate bitvec -Name: rust-%{crate} -Version: 0.19.4 +Name: rust-bitvec +Version: 0.19.6 Release: %autorelease Summary: Crate for manipulating memory, bit by bit -# Upstream license specification: MIT -# https://github.com/myrrlyn/bitvec/issues/93 License: MIT URL: https://crates.io/crates/bitvec -Source: %{crates_source} -# Initial patched metadata +Source0: %{crates_source} +# https://github.com/myrrlyn/bitvec/issues/93 +Source1: https://github.com/bitvecto-rs/bitvec/raw/v0/19/6/LICENSE.txt +# Manually created patch for downstream crate metadata changes # * bump radium from 0.5 to 0.6: # https://github.com/bitvecto-rs/bitvec/commit/dedee4b +# * drop unused, benchmark-only criterion dev-dependency to speed up builds Patch0: bitvec-fix-metadata.diff # 0.19.x series has some problems with s390x that have been fixed for 0.20.x: @@ -24,12 +25,7 @@ Patch0: bitvec-fix-metadata.diff # https://github.com/bitvecto-rs/bitvec/commit/3bce0aa Patch1: 0001-fix-s390x-issues.patch -ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Crate for manipulating memory, bit by bit.} @@ -42,11 +38,12 @@ 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 -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license LICENSE.txt +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -54,11 +51,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}+alloc-devel Summary: %{summary} @@ -66,11 +63,11 @@ BuildArch: noarch %description -n %{name}+alloc-devel %{_description} -This package contains library source intended for building other packages -which use "alloc" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "alloc" feature of the "%{crate}" crate. %files -n %{name}+alloc-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+atomic-devel Summary: %{summary} @@ -78,11 +75,11 @@ BuildArch: noarch %description -n %{name}+atomic-devel %{_description} -This package contains library source intended for building other packages -which use "atomic" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "atomic" feature of the "%{crate}" crate. %files -n %{name}+atomic-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+serde-devel Summary: %{summary} @@ -90,11 +87,11 @@ BuildArch: noarch %description -n %{name}+serde-devel %{_description} -This package contains library source intended for building other packages -which use "serde" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "serde" feature of the "%{crate}" crate. %files -n %{name}+serde-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+std-devel Summary: %{summary} @@ -102,14 +99,15 @@ BuildArch: noarch %description -n %{name}+std-devel %{_description} -This package contains library source intended for building other packages -which use "std" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "std" feature of the "%{crate}" crate. %files -n %{name}+std-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 +cp -pav %{SOURCE1} . %cargo_prep %generate_buildrequires diff --git a/sources b/sources index ffa4163..6a5a01b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bitvec-0.19.4.crate) = 851594cf67c8ec82e56d8b182c92646b6f3d3d15c21a52e5082a7221e8e280d85b68928e744d0dcbaf7200013873a1c7c7d987cbd22886f396711ab6a50ad7ff +SHA512 (bitvec-0.19.6.crate) = b0ff49814a0197e7be7dda7b0781fecf9b02e7ba0301769a89cf236c981736236263bdb5872afc711731d2c84cf8fe696b0dc4e284d24d399675f4ecc6ab7ea4