Release 0.6.7

Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
2019-05-31 20:12:57 +02:00 · 2019-05-31 20:12:57 +02:00 · b73f83ed73
parent f5b920efe5
commit b73f83ed73
6 changed files with 7 additions and 123 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,2 @@
 /skim-0.6.6.crate
+/skim-0.6.7.crate
--- a/rust-skim.spec
+++ b/rust-skim.spec
@ -1,26 +1,16 @@
-# Generated by rust2rpm
+# Generated by rust2rpm-9-1.fc30
 %bcond_without check

 %global crate skim

 Name:           rust-%{crate}
-Version:        0.6.6
+Version:        0.6.7
 Release:        1%{?dist}
 Summary:        Fuzzy Finder in Rust

 License:        MIT
 URL:            https://crates.io/crates/skim
 Source:         %{crates_source}
-# Initial patched metadata
-# https://github.com/lotabout/skim/pull/160
-# - Bump lazy_static to 1.3.0
-# - Bump nix to 0.13.0
-# - Bump regex to 1.1.5
-Patch0:         skim-fix-metadata.diff
-# - Bump log to 0.4.6
-Patch1:         skim-0.6.6-bump_log.patch
-# - Bump env_logger to 0.6.1
-Patch2:         skim-0.6.6-bump_env_logger.patch
 ExclusiveArch:  %{rust_arches}

 BuildRequires:  rust-packaging
@ -136,5 +126,8 @@ install -Dpm0644 shell/key-bindings.* %{buildroot}%{_datadir}/skim/shell/
 %endif

 %changelog
+* Fri May 31 20:09:57 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 0.6.7-1
+- Release 0.6.7
+
 * Sun Apr 14 2019 Robert-André Mauchin <zebob.m@gmail.com> - 0.6.6-1
 - Initial package
--- a/skim-0.6.6-bump_env_logger.patch
+++ b/skim-0.6.6-bump_env_logger.patch
@ -1,45 +0,0 @@
-diff -up skim-0.6.6/Cargo.toml.bump_env_logger skim-0.6.6/Cargo.toml
--- skim-0.6.6/Cargo.toml.bump_env_logger	2019-04-14 15:27:10.000000000 +0200
-+++ skim-0.6.6/Cargo.toml	2019-04-14 15:27:55.997046254 +0200
-@@ -46,7 +46,7 @@ version = "2.26.2"
- version = "0.7.1"
- 
- [dependencies.env_logger]
-version = "0.4.3"
-+version = "0.6.1"
- 
- [dependencies.fuzzy-matcher]
- version = "0.2.1"
-diff -up skim-0.6.6/src/main.rs.bump_env_logger skim-0.6.6/src/main.rs
--- skim-0.6.6/src/main.rs.bump_env_logger	2019-04-14 15:27:10.000000000 +0200
-+++ skim-0.6.6/src/main.rs	2019-04-14 16:59:10.765065637 +0200
-@@ -101,11 +101,14 @@ Usage: sk [options]
- 
- fn main() {
-     use env_logger::Builder;
-+    use env_logger::fmt::Formatter;
-     use log::{LevelFilter, Record};
-+    use std::io::Write;
- 
-    let format = |record: &Record| {
-+    let format = |buf: &mut Formatter, record: &Record| {
-         let t = time::now();
-        format!(
-+        writeln!(
-+            buf,
-             "{},{:03} - {} - {}",
-             time::strftime("%Y-%m-%d %H:%M:%S", &t).expect("main: time format error"),
-             t.tm_nsec / 1_000_000,
-@@ -118,10 +121,10 @@ fn main() {
-     builder.format(format).filter(None, LevelFilter::Info);
- 
-     if env::var("RUST_LOG").is_ok() {
-        builder.parse(&env::var("RUST_LOG").unwrap());
-+        builder.parse_filters(&env::var("RUST_LOG").unwrap());
-     }
- 
-    builder.init().expect("failed to initialize logger builder");
-+    builder.try_init().expect("failed to initialize logger builder");
- 
-     let exit_code = real_main();
-     std::process::exit(exit_code);
--- a/skim-0.6.6-bump_log.patch
+++ b/skim-0.6.6-bump_log.patch
@ -1,40 +0,0 @@
-diff -up skim-0.6.6/Cargo.toml.bump_log skim-0.6.6/Cargo.toml
--- skim-0.6.6/Cargo.toml.bump_log	2019-04-14 14:39:36.949614838 +0200
-+++ skim-0.6.6/Cargo.toml	2019-04-14 14:40:01.341591754 +0200
-@@ -55,7 +55,7 @@ version = "0.2.1"
- version = "1.3.0"
- 
- [dependencies.log]
-version = "0.3.8"
-+version = "0.4.6"
- 
- [dependencies.nix]
- version = "0.13.0"
-diff -up skim-0.6.6/src/main.rs.bump_log skim-0.6.6/src/main.rs
--- skim-0.6.6/src/main.rs.bump_log	2019-03-25 16:57:35.000000000 +0100
-+++ skim-0.6.6/src/main.rs	2019-04-14 14:41:00.982535315 +0200
-@@ -100,10 +100,10 @@ Usage: sk [options]
- ";
- 
- fn main() {
-    use env_logger::LogBuilder;
-    use log::{LogLevelFilter, LogRecord};
-+    use env_logger::Builder;
-+    use log::{LevelFilter, Record};
- 
-    let format = |record: &LogRecord| {
-+    let format = |record: &Record| {
-         let t = time::now();
-         format!(
-             "{},{:03} - {} - {}",
-@@ -114,8 +114,8 @@ fn main() {
-         )
-     };
- 
-    let mut builder = LogBuilder::new();
-    builder.format(format).filter(None, LogLevelFilter::Info);
-+    let mut builder = Builder::new();
-+    builder.format(format).filter(None, LevelFilter::Info);
- 
-     if env::var("RUST_LOG").is_ok() {
-         builder.parse(&env::var("RUST_LOG").unwrap());
--- a/skim-fix-metadata.diff
+++ b/skim-fix-metadata.diff
@ -1,25 +0,0 @@
--- skim-0.6.6/Cargo.toml       1970-01-01T01:00:00+01:00
-+++ skim-0.6.6/Cargo.toml       2019-04-14T15:26:29.767154+02:00
-@@ -52,19 +52,19 @@
- version = "0.2.1"
-
- [dependencies.lazy_static]
-version = "0.2.8"
-+version = "1.3.0"
-
- [dependencies.log]
- version = "0.3.8"
-
- [dependencies.nix]
-version = "0.11.0"
-+version = "0.13.0"
-
- [dependencies.rayon]
- version = "1.0.3"
-
- [dependencies.regex]
-version = "0.2"
-+version = "1.1.5"
-
- [dependencies.shlex]
- version = "0.1.1"
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (skim-0.6.6.crate) = 34b212bc3a9df78db40ccfb77c5e31ed525bd076acea1aa87131716659b1df0374cd02c76c4a57c8b8458dcd092499cf3381e87c1a349decf9e4b17282900657
+SHA512 (skim-0.6.7.crate) = 273337fcf6e46eff99f10b4a6eef7a66e215db0e0632531b5bab7bec4087f283dfb2bbcfcfb45613bedb94b208235f7f7acbadc1c2008c46ede7c64125f938e9