commit
fa79183a17
GPG Key ID:
1EC08A25C9DB2503
@ -0,0 +1,37 @@
|
||||
From af8d0e678603bc922ba2249d05872f08a596136d Mon Sep 17 00:00:00 2001
|
||||
From: Fabio Valentini <decathorpe@gmail.com>
|
||||
Date: Tue, 19 Dec 2023 18:56:57 +0100
|
||||
Subject: [PATCH] fix building shell completions and man pages
|
||||
|
||||
---
|
||||
build.rs | 10 ++++------
|
||||
1 file changed, 4 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/build.rs b/build.rs
|
||||
index 1a844ad..be4e686 100644
|
||||
--- a/build.rs
|
||||
+++ b/build.rs
|
||||
@@ -25,16 +25,14 @@ fn main() {
|
||||
dump_help(sq.clone()).unwrap();
|
||||
|
||||
// Generate shell completions
|
||||
- let outdir = match env::var_os("CARGO_TARGET_DIR") {
|
||||
- None => return,
|
||||
- Some(outdir) => outdir,
|
||||
- };
|
||||
+ let out_dir = std::path::PathBuf::from(
|
||||
+ std::env::var_os("OUT_DIR").ok_or(std::io::ErrorKind::NotFound).unwrap());
|
||||
|
||||
- fs::create_dir_all(&outdir).unwrap();
|
||||
+ fs::create_dir_all(&out_dir).unwrap();
|
||||
|
||||
for shell in &[Shell::Bash, Shell::Fish, Shell::Zsh, Shell::PowerShell,
|
||||
Shell::Elvish] {
|
||||
- let path = clap_complete::generate_to(*shell, &mut sq, "sq", &outdir).unwrap();
|
||||
+ let path = clap_complete::generate_to(*shell, &mut sq, "sq", &out_dir).unwrap();
|
||||
println!("cargo:warning=completion file is generated: {:?}", path);
|
||||
};
|
||||
|
||||
--
|
||||
2.43.0
|
||||
|
||||
Binary file not shown.
@ -0,0 +1,72 @@
|
||||
--- sequoia-sq-0.32.0/Cargo.toml 1970-01-01T00:00:01+00:00
|
||||
+++ sequoia-sq-0.32.0/Cargo.toml 2023-12-19T16:57:04.024891+00:00
|
||||
@@ -44,6 +44,12 @@
|
||||
]
|
||||
license = "LGPL-2.0-or-later"
|
||||
repository = "https://gitlab.com/sequoia-pgp/sequoia-sq"
|
||||
+exclude = [
|
||||
+ "/deny.toml",
|
||||
+ "/Dockerfile",
|
||||
+ "/sq.subplot",
|
||||
+ "/sq-subplot.md",
|
||||
+]
|
||||
|
||||
[profile.release]
|
||||
debug = true
|
||||
@@ -76,10 +82,6 @@
|
||||
[dependencies.dirs]
|
||||
version = "5"
|
||||
|
||||
-[dependencies.dot-writer]
|
||||
-version = "0.1.3"
|
||||
-optional = true
|
||||
-
|
||||
[dependencies.humantime]
|
||||
version = "2"
|
||||
|
||||
@@ -143,14 +145,8 @@
|
||||
[dev-dependencies.assert_cmd]
|
||||
version = "2"
|
||||
|
||||
-[dev-dependencies.fehler]
|
||||
-version = "1.0.0"
|
||||
-
|
||||
[dev-dependencies.predicates]
|
||||
version = ">=2, <4"
|
||||
-
|
||||
-[dev-dependencies.subplotlib]
|
||||
-version = ">=0.7, <0.10"
|
||||
|
||||
[build-dependencies.anyhow]
|
||||
version = "1.0.18"
|
||||
@@ -189,29 +185,19 @@
|
||||
version = "1.17"
|
||||
default-features = false
|
||||
|
||||
-[build-dependencies.subplot-build]
|
||||
-version = ">=0.7, <0.10"
|
||||
-optional = true
|
||||
-
|
||||
[build-dependencies.terminal_size]
|
||||
version = ">=0.2.6, <0.4"
|
||||
|
||||
[features]
|
||||
autocrypt = ["sequoia-autocrypt"]
|
||||
compression-bzip2 = ["sequoia-openpgp/compression-bzip2"]
|
||||
-crypto-botan = ["sequoia-openpgp/crypto-botan"]
|
||||
-crypto-botan2 = ["sequoia-openpgp/crypto-botan2"]
|
||||
-crypto-cng = ["sequoia-openpgp/crypto-cng"]
|
||||
crypto-nettle = ["sequoia-openpgp/crypto-nettle"]
|
||||
crypto-openssl = ["sequoia-openpgp/crypto-openssl"]
|
||||
-crypto-rust = ["sequoia-openpgp/crypto-rust"]
|
||||
default = [
|
||||
"crypto-nettle",
|
||||
"compression-bzip2",
|
||||
"autocrypt",
|
||||
- "dot-writer",
|
||||
-]
|
||||
-subplot = ["subplot-build"]
|
||||
+]
|
||||
|
||||
[badges.gitlab]
|
||||
repository = "sequoia-pgp/sequoia-sq"
|
||||
@ -0,0 +1,161 @@
|
||||
## START: Set by rpmautospec
|
||||
## (rpmautospec version 0.3.5)
|
||||
## RPMAUTOSPEC: autorelease, autochangelog
|
||||
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
|
||||
release_number = 1;
|
||||
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
|
||||
print(release_number + base_release_number - 1);
|
||||
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
|
||||
## END: Set by rpmautospec
|
||||
|
||||
# Generated by rust2rpm 25
|
||||
%bcond_without check
|
||||
|
||||
%global crate sequoia-sq
|
||||
|
||||
Name: rust-sequoia-sq
|
||||
Version: 0.32.0
|
||||
Release: %autorelease
|
||||
Summary: Command-line frontends for Sequoia
|
||||
|
||||
License: LGPL-2.0-or-later
|
||||
URL: https://crates.io/crates/sequoia-sq
|
||||
Source: %{crates_source}
|
||||
# Manually created patch for downstream crate metadata changes
|
||||
# * exclude files that are only useful for upstream development
|
||||
# * prevent manpages from getting installed twice
|
||||
# * drop automated generation of upstream integration tests
|
||||
# * drop features for unsupported crypto backends
|
||||
Patch: sequoia-sq-fix-metadata.diff
|
||||
# https://gitlab.com/sequoia-pgp/sequoia-sq/-/issues/163
|
||||
Patch: 0001-fix-building-shell-completions-and-man-pages.patch
|
||||
|
||||
BuildRequires: cargo-rpm-macros >= 24
|
||||
|
||||
%global _description %{expand:
|
||||
Command-line frontends for Sequoia.}
|
||||
|
||||
%description %{_description}
|
||||
|
||||
%package -n %{crate}
|
||||
Summary: %{summary}
|
||||
# (Apache-2.0 OR MIT) AND BSD-3-Clause
|
||||
# (MIT OR Apache-2.0) AND Unicode-DFS-2016
|
||||
# 0BSD OR MIT OR Apache-2.0
|
||||
# Apache-2.0
|
||||
# Apache-2.0 AND MIT
|
||||
# Apache-2.0 OR BSL-1.0
|
||||
# Apache-2.0 OR MIT
|
||||
# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
|
||||
# BSD-2-Clause OR Apache-2.0 OR MIT
|
||||
# BSL-1.0
|
||||
# LGPL-2.0-or-later
|
||||
# LGPL-3.0 OR GPL-2.0 OR GPL-3.0
|
||||
# MIT
|
||||
# MIT OR Apache-2.0
|
||||
# MIT OR Apache-2.0 OR Zlib
|
||||
# MIT OR Zlib OR Apache-2.0
|
||||
# MPL-2.0
|
||||
# Unlicense OR MIT
|
||||
# Zlib OR Apache-2.0 OR MIT
|
||||
License: LGPL-2.0-or-later AND Apache-2.0 AND BSL-1.0 AND BSD-3-Clause AND MIT AND MPL-2.0 AND Unicode-DFS-2016 AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (LGPL-3.0 OR GPL-2.0 OR GPL-3.0) AND (MIT OR Apache-2.0 OR Zlib) AND (Unlicense OR MIT)
|
||||
# LICENSE.dependencies contains a full license breakdown
|
||||
|
||||
%description -n %{crate} %{_description}
|
||||
|
||||
%files -n %{crate}
|
||||
%license LICENSE.txt
|
||||
%license LICENSE.dependencies
|
||||
%doc README.md
|
||||
%{_bindir}/sq
|
||||
%{_mandir}/man1/sq*
|
||||
%{bash_completions_dir}/sq.bash
|
||||
%{fish_completions_dir}/sq.fish
|
||||
%{zsh_completions_dir}/_sq
|
||||
|
||||
%prep
|
||||
%autosetup -n %{crate}-%{version} -p1
|
||||
%cargo_prep
|
||||
# drop broken integration tests
|
||||
rm -vr subplot/
|
||||
rm -vr tests/
|
||||
|
||||
%generate_buildrequires
|
||||
%cargo_generate_buildrequires
|
||||
|
||||
%build
|
||||
%cargo_build
|
||||
%{cargo_license_summary}
|
||||
%{cargo_license} > LICENSE.dependencies
|
||||
|
||||
%install
|
||||
%cargo_install
|
||||
# install manual pages
|
||||
mkdir -p %{buildroot}/%{_mandir}/man1
|
||||
cp -pav target/release/build/%{crate}-*/out/sq*.1 %{buildroot}/%{_mandir}/man1/
|
||||
# install shell completions
|
||||
install -Dpm 0644 target/release/build/%{crate}-*/out/sq.bash \
|
||||
%{buildroot}/%{bash_completions_dir}/sq.bash
|
||||
install -Dpm 0644 target/release/build/%{crate}-*/out/sq.fish \
|
||||
%{buildroot}/%{fish_completions_dir}/sq.fish
|
||||
install -Dpm 0644 target/release/build/%{crate}-*/out/_sq \
|
||||
%{buildroot}/%{zsh_completions_dir}/_sq
|
||||
|
||||
%if %{with check}
|
||||
%check
|
||||
%cargo_test
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Jan 15 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.32.0-1
|
||||
- Rebuilt for MSVSphere 9.3
|
||||
|
||||
* Tue Dec 19 2023 Fabio Valentini <decathorpe@gmail.com> - 0.32.0-1
|
||||
- Update to version 0.32.0; Fixes RHBZ#2108897
|
||||
|
||||
* Fri Dec 01 2023 Fabio Valentini <decathorpe@gmail.com> - 0.26.0-10
|
||||
- Rebuild for openssl crate >= v0.10.60 (RUSTSEC-2023-0044,
|
||||
RUSTSEC-2023-0072)
|
||||
|
||||
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.26.0-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Thu May 18 2023 Fabio Valentini <decathorpe@gmail.com> - 0.26.0-8
|
||||
- Rebuild for sequoia-openpgp v1.16
|
||||
|
||||
* Wed May 03 2023 Fabio Valentini <decathorpe@gmail.com> - 0.26.0-7
|
||||
- Rebuild for tokio, h2, and openssl crate security updates
|
||||
|
||||
* Fri Apr 14 2023 Fabio Valentini <decathorpe@gmail.com> - 0.26.0-6
|
||||
- Bump sequoia-autocrypt to v0.25 and sequoia-net to v0.27
|
||||
|
||||
* Sun Feb 26 2023 Fabio Valentini <decathorpe@gmail.com> - 0.26.0-5
|
||||
- Rebuild for bzip2 0.4.4 (CVE-2023-22895 / RUSTSEC-2023-0004)
|
||||
|
||||
* Sun Feb 05 2023 Fabio Valentini <decathorpe@gmail.com> - 0.26.0-4
|
||||
- Rebuild for fixed frame pointer compiler flags in Rust RPM macros
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.26.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.26.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Wed Mar 16 2022 Fabio Valentini <decathorpe@gmail.com> - 0.26.0-1
|
||||
- Update to version 0.26.0; Fixes RHBZ#2059968
|
||||
|
||||
* Tue Feb 15 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.25.0-5
|
||||
- Rebuild with package notes
|
||||
|
||||
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.25.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 0.25.0-3
|
||||
- Rebuilt with OpenSSL 3.0.0
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.25.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Thu Apr 08 2021 Fabio Valentini <decathorpe@gmail.com> - 0.25.0-1
|
||||
- Initial package
|
||||
|
||||
Loading…
Reference in new issue