diff --git a/.gitignore b/.gitignore index 5feddb2..cbc4435 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /bytecount-0.3.0.crate /bytecount-0.3.1.crate /bytecount-0.3.2.crate +/bytecount-0.5.0.crate diff --git a/bytecount-fix-metadata.diff b/bytecount-fix-metadata.diff index 630ae45..48c036f 100644 --- a/bytecount-fix-metadata.diff +++ b/bytecount-fix-metadata.diff @@ -1,30 +1,20 @@ ---- bytecount-0.3.2/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ bytecount-0.3.2/Cargo.toml 2018-10-28T02:02:14.813005+01:00 -@@ -19,6 +19,7 @@ - categories = ["algorithms", "no-std"] - license = "Apache-2.0/MIT" - repository = "https://github.com/llogiq/bytecount" -+exclude = ["/.travis.yml", "/appveyor.yml"] - - [lib] - bench = false -@@ -26,9 +27,6 @@ +--- bytecount-0.5.0/Cargo.toml 1970-01-01T01:00:00+01:00 ++++ bytecount-0.5.0/Cargo.toml 2019-02-10T09:24:13.905416+01:00 +@@ -27,9 +27,6 @@ [[bench]] name = "bench" harness = false --[dependencies.simd] --version = "0.2.0" +-[dependencies.packed_simd] +-version = "0.3.1" -optional = true [dev-dependencies.criterion] - version = "0.2.4" - -@@ -39,9 +37,7 @@ - version = "0.4" + version = "0.2.7" + default-features = false +@@ -41,7 +38,6 @@ + version = "0.6" [features] --avx-accel = ["simd-accel"] +-generic-simd = ["packed_simd"] html_report = [] --simd-accel = ["simd"] + runtime-dispatch-simd = [] [badges.appveyor] - repository = "llogiq/bytecount" - diff --git a/rust-bytecount.spec b/rust-bytecount.spec index 26dff9c..684164d 100644 --- a/rust-bytecount.spec +++ b/rust-bytecount.spec @@ -6,31 +6,30 @@ %global crate bytecount Name: rust-%{crate} -Version: 0.3.2 -Release: 3%{?dist} +Version: 0.5.0 +Release: 1%{?dist} Summary: Count occurrences of a byte, or the UTF-8 code points, in a byte slice, fast # Upstream license specification: Apache-2.0/MIT License: ASL 2.0 or MIT URL: https://crates.io/crates/bytecount -Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate +Source: %{crates_source} # Initial patched metadata # * No simd -# * Exclude CI files, https://github.com/llogiq/bytecount/pull/47 Patch0: bytecount-fix-metadata.diff ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging %if %{with check} -BuildRequires: (crate(criterion/default) >= 0.2.4 with crate(criterion/default) < 0.3.0) -BuildRequires: (crate(quickcheck/default) >= 0.6.0 with crate(quickcheck/default) < 0.7.0) -BuildRequires: (crate(rand/default) >= 0.4.0 with crate(rand/default) < 0.5.0) +BuildRequires: (crate(criterion) >= 0.2.7 with crate(criterion) < 0.3.0) +BuildRequires: (crate(quickcheck/default) >= 0.8.0 with crate(quickcheck/default) < 0.9.0) +BuildRequires: (crate(rand/default) >= 0.6.0 with crate(rand/default) < 0.7.0) %endif %global _description \ -Count occurrences of a given byte, or the number of UTF-8 code points,\ -in a byte slice, fast. +Count occurrences of a given byte, or the number of UTF-8 code points, in a\ +byte slice, fast. %description %{_description} @@ -60,8 +59,32 @@ which use "default" feature of "%{crate}" crate. %files -n %{name}+default-devel %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%package -n %{name}+html_report-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+html_report-devel %{_description} + +This package contains library source intended for building other packages +which use "html_report" feature of "%{crate}" crate. + +%files -n %{name}+html_report-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+runtime-dispatch-simd-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+runtime-dispatch-simd-devel %{_description} + +This package contains library source intended for building other packages +which use "runtime-dispatch-simd" feature of "%{crate}" crate. + +%files -n %{name}+runtime-dispatch-simd-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + %prep -%autosetup -n %{crate}-%{version} -p1 +%autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep %build @@ -76,6 +99,9 @@ which use "default" feature of "%{crate}" crate. %endif %changelog +* Sun Feb 10 2019 Igor Gnatenko - 0.5.0-1 +- Update to 0.5.0 + * Sat Feb 02 2019 Fedora Release Engineering - 0.3.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 502fb7d..9260393 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bytecount-0.3.2.crate) = fa3453f220112f83280dd3a123b25cf3ec07d2487c89cb80dc383f12e9f4d759e316d1eb05bcb0633186dc3f26d2ed58d979ba4ca86404a7f6edc4c174ae0edc +SHA512 (bytecount-0.5.0.crate) = ebbb10f8655c96ce68e94cb73ed920460779566d69c9b7ae6cc1f6041f40cbbccc3b3d1524eb96e380d17c823b51e9169361967cda594f604685ec819dcd9889 diff --git a/tests/.fmf/version b/tests/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/tests/provision.fmf b/tests/provision.fmf new file mode 100644 index 0000000..503a97c --- /dev/null +++ b/tests/provision.fmf @@ -0,0 +1,5 @@ +--- +standard-inventory-qcow2: + qemu: + # `cargo test` usually eats more than 1G. + m: 4G diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..3ea8aa7 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,13 @@ +--- +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + repositories: + - repo: "https://src.fedoraproject.org/tests/rust.git" + dest: rust + tests: + - rust/cargo-test + environment: + pkg: rust-bytecount