From 01017a709be1b64baec34e6213d125fc7f42e0eb0269f187e7470165efd57f94 Mon Sep 17 00:00:00 2001 From: Dany Marcoux Date: Mon, 11 Mar 2019 20:01:05 +0000 Subject: [PATCH 1/4] Accepting request 684109 from home:dmarcoux - Prevent cargo from updating dependencies with `--locked` - Remove unneeded macro (%defattr) - List licenses with the right macro (%license) OBS-URL: https://build.opensuse.org/request/show/684109 OBS-URL: https://build.opensuse.org/package/show/utilities/bat?expand=0&rev=7 --- bat.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bat.spec b/bat.spec index 350f19f..8722189 100644 --- a/bat.spec +++ b/bat.spec @@ -52,7 +52,7 @@ EOF %build export CARGO_HOME=$PWD/cargo-home -cargo build --release %{?_smp_mflags} +cargo build --release --locked %{?_smp_mflags} %install export CARGO_HOME=$PWD/cargo-home @@ -62,8 +62,8 @@ cargo install --root=%{buildroot}%{_prefix} rm %{buildroot}%{_prefix}/.crates.toml %files -%defattr(-,root,root) -%doc LICENSE-MIT LICENSE-APACHE README.md +%doc README.md +%license LICENSE-MIT LICENSE-APACHE %{_bindir}/bat %changelog From 0d3d6256fb946cba54b7319d2e27c99429e9fdff5492e443c9a7c5b5b4381c59 Mon Sep 17 00:00:00 2001 From: Dany Marcoux Date: Tue, 30 Apr 2019 13:19:12 +0000 Subject: [PATCH 2/4] Accepting request 699676 from home:dmarcoux - Run spec-cleaner - Remove double %setup macro - Simplify tar command in README.packager OBS-URL: https://build.opensuse.org/request/show/699676 OBS-URL: https://build.opensuse.org/package/show/utilities/bat?expand=0&rev=8 --- README.packager | 2 +- bat.changes | 7 +++++++ bat.spec | 6 ++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/README.packager b/README.packager index ccbdac8..6f5ff01 100644 --- a/README.packager +++ b/README.packager @@ -15,4 +15,4 @@ 3. Generate archive cargo vendor - tar c vendor/ | xz > vendor.tar.xz + tar -cJf vendor.tar.xz vendor diff --git a/bat.changes b/bat.changes index 8cc1c4c..8a84285 100644 --- a/bat.changes +++ b/bat.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 30 13:08:18 UTC 2019 - Dany Marcoux + +- Run spec-cleaner +- Remove double %setup macro +- Simplify tar command in README.packager + ------------------------------------------------------------------- Mon Feb 11 22:15:10 UTC 2019 - Dany Marcoux diff --git a/bat.spec b/bat.spec index 8722189..29478d8 100644 --- a/bat.spec +++ b/bat.spec @@ -22,7 +22,7 @@ Release: 0 Summary: A cat(1) clone with syntax highlighting and Git integration License: MIT Group: Productivity/Text/Utilities -Url: https://github.com/sharkdp/bat +URL: https://github.com/sharkdp/bat Source0: https://github.com/sharkdp/bat/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: vendor.tar.xz # Instructions on how to generate vendor.tar.xz @@ -32,15 +32,13 @@ BuildRequires: cmake BuildRequires: rust BuildRequires: rust-std BuildRequires: zlib-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description A cat(1) clone which supports syntax highlighting for a large number of programming and markup languages. It has git integration and automatic paging. %prep -%setup -q -%setup -q -D -T -a 1 +%setup -qa1 mkdir cargo-home cat >cargo-home/config < Date: Tue, 14 May 2019 08:07:29 +0000 Subject: [PATCH 3/4] Accepting request 702779 from home:dmarcoux Fix license in spec file. OBS-URL: https://build.opensuse.org/request/show/702779 OBS-URL: https://build.opensuse.org/package/show/utilities/bat?expand=0&rev=9 --- bat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bat.spec b/bat.spec index 29478d8..bcfa6ae 100644 --- a/bat.spec +++ b/bat.spec @@ -20,7 +20,7 @@ Name: bat Version: 0.10.0 Release: 0 Summary: A cat(1) clone with syntax highlighting and Git integration -License: MIT +License: MIT OR Apache-2.0 Group: Productivity/Text/Utilities URL: https://github.com/sharkdp/bat Source0: https://github.com/sharkdp/bat/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz From 58fb6503c1a9ee3c082fe09db09a4674378af8002c8603c7c33f65642e056f52 Mon Sep 17 00:00:00 2001 From: Dany Marcoux Date: Thu, 16 May 2019 11:31:32 +0000 Subject: [PATCH 4/4] Accepting request 703433 from home:dmarcoux - Update to version 0.11.0 * Features New color themes: ansi-light, ansi-dark and base16 The -p/--plain option can be used twice (typically -pp). First -p switches --style to "plain", second disables pager. * Bugfixes Do not replace arguments to less when using --pager Empty files are (once again) printed with a single header line --terminal-width=0 is now disallowed * New syntaxes Fish Update for F# OBS-URL: https://build.opensuse.org/request/show/703433 OBS-URL: https://build.opensuse.org/package/show/utilities/bat?expand=0&rev=10 --- bat-0.10.0.tar.gz | 3 --- bat-0.11.0.tar.gz | 3 +++ bat.changes | 15 +++++++++++++++ bat.spec | 4 ++-- vendor.tar.xz | 4 ++-- 5 files changed, 22 insertions(+), 7 deletions(-) delete mode 100644 bat-0.10.0.tar.gz create mode 100644 bat-0.11.0.tar.gz diff --git a/bat-0.10.0.tar.gz b/bat-0.10.0.tar.gz deleted file mode 100644 index 93a4632..0000000 --- a/bat-0.10.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:54dd396e8f20d44c6032a32339f45eab46a69b6134e74a704f8d4a27c18ddc3e -size 810088 diff --git a/bat-0.11.0.tar.gz b/bat-0.11.0.tar.gz new file mode 100644 index 0000000..41c06b2 --- /dev/null +++ b/bat-0.11.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb4e39efadfab71c0c929a92b82dac58deacfe2a4eb527d4256ac0634e042ed2 +size 834756 diff --git a/bat.changes b/bat.changes index 8a84285..74cf47c 100644 --- a/bat.changes +++ b/bat.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed May 15 21:22:44 UTC 2019 - Dany Marcoux + +- Update to version 0.11.0 + * Features + New color themes: ansi-light, ansi-dark and base16 + The -p/--plain option can be used twice (typically -pp). First -p switches --style to "plain", second disables pager. + * Bugfixes + Do not replace arguments to less when using --pager + Empty files are (once again) printed with a single header line + --terminal-width=0 is now disallowed + * New syntaxes + Fish + Update for F# + ------------------------------------------------------------------- Tue Apr 30 13:08:18 UTC 2019 - Dany Marcoux diff --git a/bat.spec b/bat.spec index bcfa6ae..ff56afb 100644 --- a/bat.spec +++ b/bat.spec @@ -17,7 +17,7 @@ Name: bat -Version: 0.10.0 +Version: 0.11.0 Release: 0 Summary: A cat(1) clone with syntax highlighting and Git integration License: MIT OR Apache-2.0 @@ -54,7 +54,7 @@ cargo build --release --locked %{?_smp_mflags} %install export CARGO_HOME=$PWD/cargo-home -cargo install --root=%{buildroot}%{_prefix} +cargo install --root=%{buildroot}%{_prefix} --path . # remove residue crate file rm %{buildroot}%{_prefix}/.crates.toml diff --git a/vendor.tar.xz b/vendor.tar.xz index ba7975a..7d7642a 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4321d8cdbbda7d6040e2812235174792b5475a920a0b46c89427fbb3fe57bdfa -size 10405328 +oid sha256:fcc8c7df978bf4bc6b7549093a79e30c3d625d0f64ca8f5deb84cdf5146e95d5 +size 10788192