diff --git a/README.md b/README.md deleted file mode 100644 index 36958a8..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-ripgrep - -The rust-ripgrep package \ No newline at end of file diff --git a/ripgrep-fix-metadata-auto.diff b/ripgrep-fix-metadata-auto.diff new file mode 100644 index 0000000..253a4b1 --- /dev/null +++ b/ripgrep-fix-metadata-auto.diff @@ -0,0 +1,8 @@ +--- ripgrep-13.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ ripgrep-13.0.0/Cargo.toml 2023-05-22T11:26:12.724117+00:00 +@@ -91,5 +91,3 @@ + [features] + pcre2 = ["grep/pcre2"] + simd-accel = ["grep/simd-accel"] +-[target."cfg(all(target_env = \"musl\", target_pointer_width = \"64\"))".dependencies.jemallocator] +-version = "0.3.0" diff --git a/ripgrep-fix-metadata.diff b/ripgrep-fix-metadata.diff index e182cb6..12853aa 100644 --- a/ripgrep-fix-metadata.diff +++ b/ripgrep-fix-metadata.diff @@ -1,9 +1,7 @@ --- ripgrep-13.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ ripgrep-13.0.0/Cargo.toml 2021-06-18T10:56:40.820364+00:00 -@@ -90,6 +90,3 @@ ++++ ripgrep-13.0.0/Cargo.toml 2023-05-22T11:26:26.249194+00:00 +@@ -90,4 +90,3 @@ [features] pcre2 = ["grep/pcre2"] -simd-accel = ["grep/simd-accel"] --[target."cfg(all(target_env = \"musl\", target_pointer_width = \"64\"))".dependencies.jemallocator] --version = "0.3.0" diff --git a/rust-ripgrep.spec b/rust-ripgrep.spec index db5641f..669b974 100644 --- a/rust-ripgrep.spec +++ b/rust-ripgrep.spec @@ -1,59 +1,60 @@ -# Generated by rust2rpm 17 +# Generated by rust2rpm 24 %bcond_without check -%global __cargo_skip_build 0 %global crate ripgrep -Name: rust-%{crate} +Name: rust-ripgrep Version: 13.0.0 Release: %autorelease -Summary: Line oriented search tool +Summary: Line-oriented search tool -# Upstream license specification: Unlicense OR MIT -License: Unlicense or MIT +License: Unlicense OR MIT URL: https://crates.io/crates/ripgrep Source: %{crates_source} -# Initial patched metadata +# Automatically generated patch to strip foreign dependencies +Patch: ripgrep-fix-metadata-auto.diff +# Manually created patch for downstream crate metadata changes # * drop unsupported SIMD feature -# * drop unsupported jemalloc feature -Patch0: ripgrep-fix-metadata.diff +Patch: ripgrep-fix-metadata.diff -ExclusiveArch: %{rust_arches} - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: -Line-oriented search tool that recursively searches the current directory for a -regex pattern while respecting gitignore rules. ripgrep has first class support -on Windows, macOS and Linux.} +Ripgrep is a line-oriented search tool that recursively searches the +current directory for a regex pattern while respecting gitignore rules. +ripgrep has first class support on Windows, macOS and Linux.} %description %{_description} %package -n %{crate} Summary: %{summary} -# ASL 2.0 or Boost -# ASL 2.0 or MIT +# (Apache-2.0 OR MIT) AND BSD-3-Clause +# (MIT OR Apache-2.0) AND Unicode-DFS-2016 +# Apache-2.0 OR BSL-1.0 +# Apache-2.0 OR MIT # MIT -# MIT or ASL 2.0 -# Unlicense or MIT -License: MIT and (ASL 2.0 or Boost) +# MIT OR Apache-2.0 +# Unlicense OR MIT +License: BSD-3-Clause AND MIT AND Unicode-DFS-2016 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Unlicense OR MIT) +# LICENSE.dependencies contains a full license breakdown %description -n %{crate} %{_description} %files -n %{crate} -%license LICENSE-MIT UNLICENSE COPYING -%doc README.md CHANGELOG.md FAQ.md GUIDE.md +%license COPYING +%license LICENSE-MIT +%license UNLICENSE +%license LICENSE.dependencies +%doc CHANGELOG.md +%doc FAQ.md +%doc GUIDE.md +%doc README.md +%doc RELEASE-CHECKLIST.md %{_bindir}/rg %{_mandir}/man1/rg.1* -%dir %{_datadir}/bash-completion -%dir %{_datadir}/bash-completion/completions -%{_datadir}/bash-completion/completions/rg.bash -%dir %{_datadir}/fish -%dir %{_datadir}/fish/vendor_completions.d -%{_datadir}/fish/vendor_completions.d/rg.fish -%dir %{_datadir}/zsh -%dir %{_datadir}/zsh/site-functions -%{_datadir}/zsh/site-functions/_rg +%{bash_completions_dir}/rg.bash +%{fish_completions_dir}/rg.fish +%{zsh_completions_dir}/_rg %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 @@ -65,16 +66,20 @@ echo '/usr/bin/asciidoctor' %build %cargo_build -a +%cargo_license_summary -a +%{cargo_license -a} > LICENSE.dependencies %install %cargo_install -a +# install manpage install -Dpm0644 -t %{buildroot}%{_mandir}/man1 \ target/release/build/%{crate}-*/out/rg.1 -install -Dpm0644 -t %{buildroot}%{_datadir}/bash-completion/completions \ +# install shell completions +install -Dpm0644 -t %{buildroot}%{bash_completions_dir} \ target/release/build/%{crate}-*/out/rg.bash -install -Dpm0644 -t %{buildroot}%{_datadir}/fish/vendor_completions.d \ +install -Dpm0644 -t %{buildroot}%{fish_completions_dir} \ target/release/build/%{crate}-*/out/rg.fish -install -Dpm0644 -t %{buildroot}%{_datadir}/zsh/site-functions \ +install -Dpm0644 -t %{buildroot}%{zsh_completions_dir} \ complete/_rg %if %{with check} diff --git a/rust2rpm.conf b/rust2rpm.conf new file mode 100644 index 0000000..5f336f1 --- /dev/null +++ b/rust2rpm.conf @@ -0,0 +1,4 @@ +[DEFAULT] +all-features = true +buildrequires = + /usr/bin/asciidoctor