diff --git a/.gitignore b/.gitignore index 19ff07b..8cb4fac 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /grep-0.2.6.crate /grep-0.2.7.crate /grep-0.2.8.crate +/grep-0.2.10.crate diff --git a/.rust2rpm.conf b/.rust2rpm.conf new file mode 100644 index 0000000..cae7951 --- /dev/null +++ b/.rust2rpm.conf @@ -0,0 +1,4 @@ +[DEFAULT] +unwanted-features = + avx-accel + simd-accel diff --git a/rust-grep.spec b/rust-grep.spec index 07c470a..04be729 100644 --- a/rust-grep.spec +++ b/rust-grep.spec @@ -1,29 +1,22 @@ -# Generated by rust2rpm 17 +# Generated by rust2rpm 21 %bcond_without check %global debug_package %{nil} %global crate grep Name: rust-%{crate} -Version: 0.2.8 +Version: 0.2.10 Release: %autorelease Summary: Fast line oriented regex searching as a library -# Upstream license specification: Unlicense/MIT +# Upstream license specification: Unlicense OR MIT License: Unlicense or MIT URL: https://crates.io/crates/grep Source: %{crates_source} -# Initial patched metadata -# * remove simd-accel feature with broken dependencies -# * remove deprecated avx-accel feature -Patch0: grep-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Fast line oriented regex searching as a library.} @@ -36,13 +29,15 @@ 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 -%license COPYING UNLICENSE LICENSE-MIT -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/COPYING +%license %{crate_instdir}/LICENSE-MIT +%license %{crate_instdir}/UNLICENSE +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -50,11 +45,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}+grep-pcre2-devel Summary: %{summary} @@ -62,11 +57,11 @@ BuildArch: noarch %description -n %{name}+grep-pcre2-devel %{_description} -This package contains library source intended for building other packages -which use "grep-pcre2" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "grep-pcre2" feature of the "%{crate}" crate. %files -n %{name}+grep-pcre2-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+pcre2-devel Summary: %{summary} @@ -74,11 +69,11 @@ BuildArch: noarch %description -n %{name}+pcre2-devel %{_description} -This package contains library source intended for building other packages -which use "pcre2" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "pcre2" feature of the "%{crate}" crate. %files -n %{name}+pcre2-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 cd1a864..ce09c35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grep-0.2.8.crate) = f17c624be49ddc6aeacb9bfb8d73663ccd07e0255912af52e11124e2b304836aec93e5d9d00f4ef723274f1d00ee575301fe40038d777e9eeaa03e571d778862 +SHA512 (grep-0.2.10.crate) = 05f4504825ebe1da902f280ad8ba10b5ed9a8360aa236956a25d4b1d6a8545780416f50175c9a209f7967ff31298ebbee43c7d006a583fe2dd983f3f19bae393