From b8fa717c891808939f170068f0f1a262b78a2450 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 8 Oct 2023 15:30:31 +0200 Subject: [PATCH] Update to version 0.6.4; Fixes RHBZ#2241659 --- .gitignore | 1 + bytecount-fix-metadata.diff | 10 +++++----- rust-bytecount.spec | 10 +++++----- rust2rpm.conf | 5 ----- rust2rpm.toml | 9 +++++++++ sources | 2 +- 6 files changed, 21 insertions(+), 16 deletions(-) delete mode 100644 rust2rpm.conf create mode 100644 rust2rpm.toml diff --git a/.gitignore b/.gitignore index 51dee01..0786fd9 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /bytecount-0.6.1.crate /bytecount-0.6.2.crate /bytecount-0.6.3.crate +/bytecount-0.6.4.crate diff --git a/bytecount-fix-metadata.diff b/bytecount-fix-metadata.diff index f38ce57..903ce81 100644 --- a/bytecount-fix-metadata.diff +++ b/bytecount-fix-metadata.diff @@ -1,11 +1,11 @@ ---- bytecount-0.6.3/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ bytecount-0.6.3/Cargo.toml 2023-08-06T13:05:22.169071+00:00 -@@ -42,10 +42,6 @@ +--- bytecount-0.6.4/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ bytecount-0.6.4/Cargo.toml 2023-10-08T13:28:58.674059+00:00 +@@ -41,10 +41,6 @@ + version = "0.3.8" optional = true - package = "packed_simd_2" -[dev-dependencies.criterion] --version = "0.3" +-version = "0.4" -default-features = false - [dev-dependencies.quickcheck] diff --git a/rust-bytecount.spec b/rust-bytecount.spec index 6e5cabf..6eaef74 100644 --- a/rust-bytecount.spec +++ b/rust-bytecount.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} %global crate bytecount Name: rust-bytecount -Version: 0.6.3 +Version: 0.6.4 Release: %autorelease Summary: Count occurrences of a given byte, or the number of UTF-8 code points @@ -14,10 +14,10 @@ License: Apache-2.0 OR MIT URL: https://crates.io/crates/bytecount Source: %{crates_source} # Manually created patch for downstream crate metadata changes -# * drop unused, benchmark-only criterion dev-dependency to speed up builds +# * drop unused, benchmark-only criterion dev-dependency Patch: bytecount-fix-metadata.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Count occurrences of a given byte, or the number of UTF-8 code points, @@ -77,7 +77,7 @@ use the "runtime-dispatch-simd" feature of the "%{crate}" crate. %ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep %generate_buildrequires diff --git a/rust2rpm.conf b/rust2rpm.conf deleted file mode 100644 index dbfb536..0000000 --- a/rust2rpm.conf +++ /dev/null @@ -1,5 +0,0 @@ -[DEFAULT] -summary = Count occurrences of a given byte, or the number of UTF-8 code points -unwanted-features = - generic-simd - packed_simd diff --git a/rust2rpm.toml b/rust2rpm.toml new file mode 100644 index 0000000..4cf29ff --- /dev/null +++ b/rust2rpm.toml @@ -0,0 +1,9 @@ +[package] +summary = "Count occurrences of a given byte, or the number of UTF-8 code points" + +[features] +hide = [ + "generic-simd", + "packed_simd", +] + diff --git a/sources b/sources index fa0663e..062a36b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bytecount-0.6.3.crate) = 0c5f424329883726589e69842d2ac0767dc0b440d744a4452a14cbd449b8ca2e8117fa2978b4aa9b803a1a7cf79e9cf67e948057e8ee521e2422ca2e145ea670 +SHA512 (bytecount-0.6.4.crate) = c42367ed5aaddf903d7033dbacece46bc509f9be273a6f8bc11d0c409ad40d0be6425d7518cc19ec0540df806ef039454567cbe9c24284bba02e4f91b8473547