diff --git a/.gitignore b/.gitignore index 5bbbb11..6e3c140 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /skim-0.6.6.crate /skim-0.6.7.crate +/skim-0.6.8.crate diff --git a/0001-tuikit-update-to-v0.2.7.patch b/0001-tuikit-update-to-v0.2.7.patch deleted file mode 100644 index 976a336..0000000 --- a/0001-tuikit-update-to-v0.2.7.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3c1d0dc3a6587339025bd0ac4678d05db3918116 Mon Sep 17 00:00:00 2001 -From: Jinzhou Zhang -Date: Tue, 4 Jun 2019 09:35:35 +0800 -Subject: [PATCH] [tuikit] update to v0.2.7 - ---- - src/model.rs | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/model.rs b/src/model.rs -index cea798193510..91ebea88f628 100644 ---- a/src/model.rs -+++ b/src/model.rs -@@ -564,16 +564,16 @@ impl Draw for Model { - - let win_selection = Win::new(&self.selection); - let win_query = Win::new(&self.query) -- .basis(if self.inline_info { 0 } else { 1 }.into()) -+ .basis(if self.inline_info { 0 } else { 1 }) - .grow(0) - .shrink(0); - let win_status = Win::new(&status) -- .basis(if self.inline_info { 0 } else { 1 }.into()) -+ .basis(if self.inline_info { 0 } else { 1 }) - .grow(0) - .shrink(0); - let win_header = Win::new(&self.header).grow(0).shrink(0); - let win_query_status = HSplit::default() -- .basis(if self.inline_info { 1 } else { 0 }.into()) -+ .basis(if self.inline_info { 1 } else { 0 }) - .grow(0) - .shrink(0) - .split(Win::new(&self.query).grow(0).shrink(0)) --- -2.21.0 - diff --git a/rust-skim.spec b/rust-skim.spec index c378449..990015e 100644 --- a/rust-skim.spec +++ b/rust-skim.spec @@ -1,48 +1,31 @@ -# Generated by rust2rpm-9-1.fc30 +# Generated by rust2rpm 10 %bcond_without check %global crate skim Name: rust-%{crate} -Version: 0.6.7 -Release: 2%{?dist} +Version: 0.6.8 +Release: 1%{?dist} Summary: Fuzzy Finder in Rust +# Upstream license specification: MIT License: MIT URL: https://crates.io/crates/skim Source: %{crates_source} -# Initial patched metadata -# * Bump nix to 0.14, https://github.com/lotabout/skim/pull/185 -# * Bump tuikit to 0.2.7, https://github.com/lotabout/skim/pull/184/commits/3c1d0dc3a6587339025bd0ac4678d05db3918116 -Patch0: skim-fix-metadata.diff -Patch1: 0001-tuikit-update-to-v0.2.7.patch ExclusiveArch: %{rust_arches} +%if %{__cargo_skip_build} +BuildArch: noarch +%endif BuildRequires: rust-packaging -BuildRequires: (crate(bitflags/default) >= 1.0.4 with crate(bitflags/default) < 2.0.0) -BuildRequires: (crate(chrono/default) >= 0.4.0 with crate(chrono/default) < 0.5.0) -BuildRequires: (crate(clap/default) >= 2.26.2 with crate(clap/default) < 3.0.0) -BuildRequires: (crate(derive_builder/default) >= 0.7.1 with crate(derive_builder/default) < 0.8.0) -BuildRequires: (crate(env_logger/default) >= 0.6.1 with crate(env_logger/default) < 0.7.0) -BuildRequires: (crate(fuzzy-matcher/default) >= 0.2.1 with crate(fuzzy-matcher/default) < 0.3.0) -BuildRequires: (crate(lazy_static/default) >= 1.3.0 with crate(lazy_static/default) < 2.0.0) -BuildRequires: (crate(log/default) >= 0.4.6 with crate(log/default) < 0.5.0) -BuildRequires: (crate(nix/default) >= 0.14.0 with crate(nix/default) < 0.15.0) -BuildRequires: (crate(rayon/default) >= 1.0.3 with crate(rayon/default) < 2.0.0) -BuildRequires: (crate(regex/default) >= 1.1.5 with crate(regex/default) < 2.0.0) -BuildRequires: (crate(shlex/default) >= 0.1.1 with crate(shlex/default) < 0.2.0) -BuildRequires: (crate(time/default) >= 0.1.38 with crate(time/default) < 0.2.0) -BuildRequires: (crate(timer/default) >= 0.2.0 with crate(timer/default) < 0.3.0) -BuildRequires: (crate(tuikit/default) >= 0.2.7 with crate(tuikit/default) < 0.3.0) -BuildRequires: (crate(unicode-width/default) >= 0.1.4 with crate(unicode-width/default) < 0.2.0) -BuildRequires: (crate(vte/default) >= 0.3.3 with crate(vte/default) < 0.4.0) -%global _description \ -Fuzzy Finder in Rust. +%global _description %{expand: +Fuzzy Finder in rust!.} %description %{_description} +%if ! %{__cargo_skip_build} %package -n %{crate} Summary: %{summary} @@ -64,6 +47,7 @@ Summary: %{summary} %dir %{_datadir}/zsh %dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/_sk +%endif %package devel Summary: %{summary} @@ -93,38 +77,39 @@ which use "default" feature of "%{crate}" crate. %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 -%cargo_prep - # Cleanup interpreters sed -i -e '/^#!\//, 1d' shell/completion.* sed -i -e '1d;2i#!/bin/bash' bin/sk-tmux +%cargo_prep + +%generate_buildrequires +%cargo_generate_buildrequires %build %cargo_build %install %cargo_install -install -Dpm0755 bin/sk-tmux %{buildroot}%{_bindir}/ -install -d %{buildroot}%{_mandir}/man1/ -install -Dpm0644 man/man1/*.1 %{buildroot}%{_mandir}/man1/ +install -Dpm0755 -t %{buildroot}%{_bindir} \ + bin/sk-tmux +install -Dpm0644 -t %{buildroot}%{_mandir}/man1 \ + man/man1/* install -d %{buildroot}%{_datadir}/skim # Install vim plugin -install -d %{buildroot}%{_datadir}/vim/vimfiles/plugin -install -Dpm0644 plugin/skim.vim %{buildroot}%{_datadir}/vim/vimfiles/plugin/ -install -d %{buildroot}%{_datadir}/nvim/site/plugin -install -Dpm0644 plugin/skim.vim %{buildroot}%{_datadir}/nvim/site/plugin/ +install -Dpm0644 -t %{buildroot}%{_datadir}/vim/vimfiles/plugin \ + plugin/skim.vim +install -Dpm0644 -t %{buildroot}%{_datadir}/nvim/site/plugin \ + plugin/skim.vim # Install shell completion -install -d %{buildroot}%{_datadir}/bash-completion/completions install -Dpm0644 shell/completion.bash %{buildroot}%{_datadir}/bash-completion/completions/sk -install -d %{buildroot}%{_datadir}/zsh/site-functions install -Dpm0644 shell/completion.zsh %{buildroot}%{_datadir}/zsh/site-functions/_sk # Install shell key bindings (not enabled) -install -d %{buildroot}%{_datadir}/skim/shell -install -Dpm0644 shell/key-bindings.* %{buildroot}%{_datadir}/skim/shell/ +install -Dpm0644 -t %{buildroot}%{_datadir}/skim/shell \ + shell/key-bindings.* %if %{with check} %check @@ -132,6 +117,9 @@ install -Dpm0644 shell/key-bindings.* %{buildroot}%{_datadir}/skim/shell/ %endif %changelog +* Mon Jun 24 21:43:07 CEST 2019 Igor Gnatenko - 0.6.8-1 +- Update to 0.6.8 + * Wed Jun 05 2019 Josh Stone - 0.6.7-2 - Bump nix to 0.14 diff --git a/skim-fix-metadata.diff b/skim-fix-metadata.diff deleted file mode 100644 index 6fffa54..0000000 --- a/skim-fix-metadata.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- skim-0.6.7/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ skim-0.6.7/Cargo.toml 2019-06-05T00:49:10.425754+00:00 -@@ -58,7 +58,7 @@ - version = "0.4.6" - - [dependencies.nix] --version = "0.13.0" -+version = "0.14.0" - - [dependencies.rayon] - version = "1.0.3" -@@ -76,7 +76,7 @@ - version = "0.2.0" - - [dependencies.tuikit] --version = "0.2.6" -+version = "0.2.7" - - [dependencies.unicode-width] - version = "0.1.4" diff --git a/sources b/sources index 26eedca..41e4d86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (skim-0.6.7.crate) = 273337fcf6e46eff99f10b4a6eef7a66e215db0e0632531b5bab7bec4087f283dfb2bbcfcfb45613bedb94b208235f7f7acbadc1c2008c46ede7c64125f938e9 +SHA512 (skim-0.6.8.crate) = 124bcddf623890521b1fcd39b022303b021a8396d9049352725c02bbba8a90d8c3611bb519bb2072d767954eedfc9b81af74642eaf4378f334f374d46ac3dad2 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..17995eb --- /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-skim