From 3effe26d156617b6c8d895af9267d2b8a2782d53 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Jan 11 2021 20:00:28 +0000 Subject: Update to 1.2.0 Signed-off-by: Igor Raits --- diff --git a/desed--remove-nonlinux-deps-from-cargo.patch b/desed--remove-nonlinux-deps-from-cargo.patch deleted file mode 100644 index 961b554..0000000 --- a/desed--remove-nonlinux-deps-from-cargo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -rU4 desed-1.2.0/Cargo.toml desed-1.2.0--patched/Cargo.toml ---- desed-1.2.0/Cargo.toml 2020-10-02 01:36:04.000000000 +0200 -+++ desed-1.2.0--patched/Cargo.toml 2020-10-05 09:10:34.097428219 +0200 -@@ -37,8 +37,7 @@ - [dependencies.tui] - version = "0.9.1" - features = ["crossterm"] - default-features = false --[target."cfg(any(target_os=\"darwin\", target_os=\"dragonfly\", target_os=\"freebsd\", target_os=\"netbsd\", target_os=\"openbsd\"))".dependencies.kqueue] --version = "1.0.1" -+ - [target."cfg(target_os = \"linux\")".dependencies.inotify] - version = "0.8.3" diff --git a/desed-fix-metadata.diff b/desed-fix-metadata.diff new file mode 100644 index 0000000..e708669 --- /dev/null +++ b/desed-fix-metadata.diff @@ -0,0 +1,10 @@ +--- desed-1.2.0/Cargo.toml 2020-10-01T23:36:04+00:00 ++++ desed-1.2.0/Cargo.toml 2021-01-11T19:57:59.832644+00:00 +@@ -38,7 +38,5 @@ + version = "0.9.1" + features = ["crossterm"] + default-features = false +-[target."cfg(any(target_os=\"darwin\", target_os=\"dragonfly\", target_os=\"freebsd\", target_os=\"netbsd\", target_os=\"openbsd\"))".dependencies.kqueue] +-version = "1.0.1" + [target."cfg(target_os = \"linux\")".dependencies.inotify] + version = "0.8.3" diff --git a/rust-desed.spec b/rust-desed.spec index b8f0e92..6cbe5d9 100644 --- a/rust-desed.spec +++ b/rust-desed.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 13 +# Generated by rust2rpm 17 %bcond_without check %global __cargo_skip_build 0 @@ -6,19 +6,16 @@ Name: rust-%{crate} Version: 1.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Sed script debugger # Upstream license specification: GPL-3.0-or-later License: GPLv3+ - URL: https://crates.io/crates/desed Source: %{crates_source} - -# cargo_generate_buildrequires generates BRs for all dependencies, -# including non-Linux OS-specific ones. -# This patch removes those from Cargo.toml. -Patch0: desed--remove-nonlinux-deps-from-cargo.patch +# Initial patched metadata +# * No bsd deps +Patch0: desed-fix-metadata.diff ExclusiveArch: %{rust_arches} @@ -31,10 +28,12 @@ Sed script debugger. Debug and demystify your sed scripts with TUI debugger.} %package -n %{crate} Summary: %{summary} -# * ASL 2.0 or MIT -# * MIT -# * MIT or ASL 2.0 -License: GPLv3+ and MIT +# BSD +# GPLv3+ +# ISC +# MIT +# MIT or ASL 2.0 +License: GPLv3+ and BSD and ISC and MIT Requires: sed >= 4.6 %description -n %{crate} %{_description} @@ -63,6 +62,9 @@ Requires: sed >= 4.6 %endif %changelog +* Mon Jan 11 20:57:59 CET 2021 Igor Raits - 1.2.0-3 +- Fixup license tag + * Mon Dec 28 13:29:25 CET 2020 Igor Raits - 1.2.0-2 - Rebuild