[rpms/rust-sequoia-sq] eln: Update to version 1.4.0

public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed

From: Fabio Valentini <decathorpe@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/rust-sequoia-sq] eln: Update to version 1.4.0
Date: Tue, 14 Jul 2026 10:25:25 GMT	[thread overview]
Message-ID: <178402472572.1.1956343327216467216.rpms-rust-sequoia-sq-5a94be1ed194@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/rust-sequoia-sq
Branch : eln
Commit : 5a94be1ed194b5cf1faf1d3b8f66b6f80f4280f0
Author : Fabio Valentini <decathorpe@gmail.com>
Date   : 2026-07-14T12:24:34+02:00
Stats  : +70/-64 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-sequoia-sq/c/5a94be1ed194b5cf1faf1d3b8f66b6f80f4280f0?branch=eln

Log:
Update to version 1.4.0

---
diff --git a/.gitignore b/.gitignore
index 35e3dcd..a51f214 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,5 @@
 /sequoia-sq-1.3.0-vendor.tar.xz
 /sequoia-sq-1.3.1.crate
 /sequoia-sq-1.3.1-vendor.tar.xz
+/sequoia-sq-1.4.0.crate
+/sequoia-sq-1.4.0-vendor.tar.xz

diff --git a/rust-sequoia-sq.spec b/rust-sequoia-sq.spec
index 15f7135..b148a10 100644
--- a/rust-sequoia-sq.spec
+++ b/rust-sequoia-sq.spec
@@ -1,28 +1,21 @@
-# Generated by rust2rpm 27
+# Generated by rust2rpm 28
 %bcond check 1
 
-# RHEL does not have packages for Rust dependencies
-%bcond bundled_rust_deps %{defined:rhel}
-
 %global crate sequoia-sq
 
 Name:           rust-sequoia-sq
-Version:        1.3.1
+Version:        1.4.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}
-# To create the vendor tarball:
-#   tar xf %%{crate}-%%{version}.crate ; \
-#   pushd %%{crate}-%%{version} ; \
-#   rm Cargo.lock ; \
-#   patch -p1 < ../sequoia-sq-fix-metadata.diff ; \
-#   cargo vendor --versioned-dirs ; \
-#   tar Jcvf ../%%{crate}-%%{version}-vendor.tar.xz vendor/ ; \
-#   popd
+
+# generated using vendor.sh
 Source1:        %{crate}-%{version}-vendor.tar.xz
+Source2:        vendor.sh
+
 # Manually created patch for downstream crate metadata changes
 # * switch crypto backend from Nettle to OpenSSL
 # * exclude files that are only useful for upstream development
@@ -30,17 +23,15 @@ Source1:        %{crate}-%{version}-vendor.tar.xz
 # * drop features for unsupported crypto backends
 Patch:          sequoia-sq-fix-metadata.diff
 
-%if %{with bundled_rust_deps}
 BuildRequires:  rust-toolset
+# vendored bindgen crate
+BuildRequires:  clang
 # vendored capnpc crate
 BuildRequires:  /usr/bin/capnp
 # vendored libsqlite3-sys crate
-BuildRequires:  pkgconfig(sqlite3) >= 3.7.16
+BuildRequires:  pkgconfig(sqlite3) >= 3.37.0
 # vendored openssl-sys crate
 BuildRequires:  openssl-devel
-%else
-BuildRequires:  cargo-rpm-macros >= 24
-%endif
 
 %global _description %{expand:
 Command-line frontends for Sequoia.}
@@ -50,10 +41,10 @@ Command-line frontends for Sequoia.}
 %package     -n %{crate}
 Summary:        %{summary}
 # (Apache-2.0 OR MIT) AND BSD-3-Clause
+# (MIT OR Apache-2.0) AND Apache-2.0
 # 0BSD OR MIT OR Apache-2.0
 # Apache-2.0
 # Apache-2.0 OR BSL-1.0
-# Apache-2.0 OR ISC OR MIT
 # 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
@@ -67,22 +58,24 @@ Summary:        %{summary}
 # MPL-2.0
 # Unicode-3.0
 # Unlicense OR MIT
+# Zlib
 # Zlib OR Apache-2.0 OR MIT
+# bzip2-1.0.6
 License:        %{shrink:
-    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 ISC OR MIT) AND
-    (Apache-2.0 OR MIT) AND
-    (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND
-    (MIT OR Apache-2.0 OR Zlib) AND
-    (Unlicense OR MIT)
+    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 ISC OR MIT)
+    AND (Apache-2.0 OR MIT)
+    AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT)
+    AND (MIT OR Apache-2.0 OR Zlib)
+    AND (Unlicense OR MIT)
 }
 # LICENSE.dependencies contains a full license breakdown
 
@@ -91,9 +84,8 @@ License:        %{shrink:
 %files       -n %{crate}
 %license LICENSE.txt
 %license LICENSE.dependencies
-%if %{with bundled_rust_deps}
 %license cargo-vendor.txt
-%endif
+%doc NEWS
 %doc README.md
 %{_bindir}/sq
 %{_mandir}/man1/sq*
@@ -102,31 +94,19 @@ License:        %{shrink:
 %{zsh_completions_dir}/_sq
 
 %prep
-%if %{with bundled_rust_deps}
 %autosetup -n %{crate}-%{version} -p1 -a1
 %cargo_prep -v vendor
-rm Cargo.lock
-%else
-%autosetup -n %{crate}-%{version} -p1
-%cargo_prep
-%endif
+rm -v Cargo.lock
 # drop broken integration tests
 rm -vr subplot/
 rm -v tests/sq-subplot.rs
 
-%if %{without bundled_rust_deps}
-%generate_buildrequires
-%cargo_generate_buildrequires
-%endif
-
 %build
 export ASSET_OUT_DIR=target/assets
 %cargo_build
 %{cargo_license_summary}
 %{cargo_license} > LICENSE.dependencies
-%if %{with bundled_rust_deps}
 %cargo_vendor_manifest
-%endif
 
 %install
 %cargo_install

diff --git a/sequoia-sq-fix-metadata.diff b/sequoia-sq-fix-metadata.diff
index 3ab7429..c9f834b 100644
--- a/sequoia-sq-fix-metadata.diff
+++ b/sequoia-sq-fix-metadata.diff
@@ -1,5 +1,5 @@
---- sequoia-sq-1.3.1/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ sequoia-sq-1.3.1/Cargo.toml	2025-03-31T21:18:29.193949+00:00
+--- sequoia-sq-1.4.0/Cargo.toml	2006-07-24T01:21:28+00:00
++++ sequoia-sq-1.4.0/Cargo.toml	2026-07-14T09:57:35.879880+00:00
 @@ -49,6 +49,12 @@
  ]
  license = "LGPL-2.0-or-later"
@@ -13,10 +13,12 @@
  
  [badges.gitlab]
  repository = "sequoia-pgp/sequoia-sq"
-@@ -57,18 +63,8 @@
+@@ -57,20 +63,8 @@
  status = "actively-developed"
  
  [features]
+-allow-experimental-crypto = ["sequoia-openpgp/allow-experimental-crypto"]
+-allow-variable-time-crypto = ["sequoia-openpgp/allow-variable-time-crypto"]
 -crypto-botan = ["sequoia-openpgp/crypto-botan"]
 -crypto-botan2 = ["sequoia-openpgp/crypto-botan2"]
 -crypto-cng = ["sequoia-openpgp/crypto-cng"]
@@ -33,20 +35,20 @@
  
  [[bin]]
  name = "sq"
-@@ -79,11 +75,6 @@
+@@ -80,11 +74,6 @@
+ [[test]]
  name = "integration"
  path = "tests/integration.rs"
- 
+-
 -[[test]]
 -name = "sq-subplot"
 -path = "tests/sq-subplot.rs"
 -required-features = ["subplot"]
--
+ 
  [dependencies.aho-corasick]
  version = "1"
- 
-@@ -111,10 +102,6 @@
- version = "0.7"
+@@ -113,10 +102,6 @@
+ version = ">=0.7, <2"
  default-features = false
  
 -[dependencies.culpa]
@@ -54,25 +56,25 @@
 -optional = true
 -
  [dependencies.dirs]
- version = "5"
+ version = ">=5, <7"
  
-@@ -192,10 +179,6 @@
+@@ -197,10 +182,6 @@
  [dependencies.serde]
  version = "1.0.137"
  features = ["derive"]
 -
 -[dependencies.subplotlib]
--version = ">=0.11, <0.13"
+-version = ">=0.11, <0.14"
 -optional = true
  
  [dependencies.tempfile]
  version = "3.1"
-@@ -298,10 +281,6 @@
+@@ -303,10 +284,6 @@
  version = "1.0.137"
  features = ["derive"]
  
 -[build-dependencies.subplot-build]
--version = ">=0.11, <0.13"
+-version = ">=0.11, <0.14"
 -optional = true
 -
  [build-dependencies.terminal_size]

diff --git a/sources b/sources
index 921ee95..23f7922 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (sequoia-sq-1.3.1.crate) = 3aa4468b7bcb27532907ce759852e6b92b394a2fc91953b9f3723b9deaab3661c84fb298d79ef3332467aa7a5ca1158d6a8bd65dd961d30aafdcfb34a867c880
-SHA512 (sequoia-sq-1.3.1-vendor.tar.xz) = ceed4155b6b891e171aa5ca684ec8676a16a9fd5db60caab3d770d97f90a45049f53dc4c73701a130d09fa761da64e9a11030bc5ce0dae53560bf24db565e8ee
+SHA512 (sequoia-sq-1.4.0.crate) = 53a776ddd367e3d327770aff964f64010618a9ebc8380f57316fd65b3b76288bf8232ae4090d29b3bb57cc48092dfd932471dcef81b0672ba6e5ddbb060985f1
+SHA512 (sequoia-sq-1.4.0-vendor.tar.xz) = 150ca3e0d06735b944c35aa85c00031d802ae7d7a41c3856271fb3a65b8d3cbf8acac4483d0d95ccc8be9c61981b803541bcd13fd8b50530bcb60939693cf1f7

diff --git a/vendor.sh b/vendor.sh
new file mode 100755
index 0000000..8f47e8b
--- /dev/null
+++ b/vendor.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/bash
+
+set -e
+
+NAME=rust-sequoia-sq
+CRATE=sequoia-sq
+SPEC="${NAME}.spec"
+VERSION=$(rpmspec -q --srpm --queryformat "%{version}" ${SPEC})
+
+spectool -g ${SPEC}
+
+tar -xzf ${CRATE}-${VERSION}.crate
+
+pushd ${CRATE}-${VERSION}
+patch -p1 < ../sequoia-sq-fix-metadata.diff
+rm -f Cargo.lock
+cargo vendor --versioned-dirs vendor
+tar -Jcf ../${CRATE}-${VERSION}-vendor.tar.xz vendor/
+popd
+
+rm -rf ${CRATE}-${VERSION}/
+

                 reply	other threads:[~2026-07-14 10:25 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178402472572.1.1956343327216467216.rpms-rust-sequoia-sq-5a94be1ed194@fedoraproject.org \
    --to=decathorpe@gmail.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox