diff --git a/_service b/_service
index 1f9b157..00e6015 100644
--- a/_service
+++ b/_service
@@ -1,28 +1,24 @@
-
+
https://github.com/str4d/rage.git
@PARENT_TAG@+@TAG_OFFSET@
git
- v0.9.2
+ v0.10.0
*
v(\d+\.\d+\.\d+)
\1
enable
william.brown@suse.com
-
-
+
+
*.tar
gz
-
-
+
+
rage
zst
true
-
- rage
- Cargo.lock
-
diff --git a/_servicedata b/_servicedata
index f61805d..1d7487e 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://github.com/str4d/rage.git
- e6180f1a2004008873b8e8d40110995ecec416c4
\ No newline at end of file
+ 5c82b234c6ad3a537b80e8671ae59875464dd53f
\ No newline at end of file
diff --git a/cargo_config b/cargo_config
deleted file mode 100644
index 6fb4ff4..0000000
--- a/cargo_config
+++ /dev/null
@@ -1,5 +0,0 @@
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "vendor"
\ No newline at end of file
diff --git a/rage-0.10.0+0.tar.gz b/rage-0.10.0+0.tar.gz
new file mode 100644
index 0000000..ce22cfa
--- /dev/null
+++ b/rage-0.10.0+0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a1eb1f73868b31bbb20e074b384f4b710572c98ebc1e31ad8fb3b35fdc234fd
+size 1646541
diff --git a/rage-0.9.2+0.tar.gz b/rage-0.9.2+0.tar.gz
deleted file mode 100644
index 3c4b6d4..0000000
--- a/rage-0.9.2+0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:faaf7716819e4d30d47bead3e35c7776442a790fe072b80485cb69930dc28661
-size 1600116
diff --git a/rage-encryption.changes b/rage-encryption.changes
index d8127cb..6a736a4 100644
--- a/rage-encryption.changes
+++ b/rage-encryption.changes
@@ -1,3 +1,45 @@
+-------------------------------------------------------------------
+Mon Apr 22 12:15:24 UTC 2024 - Joshua Smith
+
+- Enable tests
+- Install all language manpages
+- Fix -keygen installing to -mount
+- Switch from obsoleted practices to modern ones:
+ * %setup is now %autosetup
+ * cargo_config is now part of vendor file
+ * disabledrun is now manualrun
+- Update to version 0.10.0+0:
+ Added:
+ * Russian translation
+ * rage-keygen -y IDENTITY_FILE to convert identity files to
+ recipients.
+ Changed:
+ * MSRV is now 1.65.0.
+ * Migrated from gumdrop to clap for argument parsing.
+ * -R/--recipients-file and -i/--identity now support "read-once"
+ files, like those used by process substitution (-i
+ <(other_binary get-age-identity)) and named pipes.
+ * The filename - (hyphen) is now treated as an explicit request
+ to read from standard input when used with -R/--recipients-file
+ or -i/--identity. It must only occur once across the
+ -R/--recipients-file and -i/--identity flags, and the input
+ file. It cannot be used if the input file is omitted.
+ Fixed:
+ * OpenSSH private keys passed to -i/--identity that contain
+ invalid public keys are no longer ignored when encrypting, and
+ instead cause an error.
+ * Weak ssh-rsa public keys that are smaller than 2048 bits are
+ now rejected.
+ * rage-keygen no longer overwrites existing key files with the
+ -o/--output flag. This was its behaviour prior to 0.6.0, but
+ was unintentionally changed when rage was modified to overwrite
+ existing files. Key file overwriting can still be achieved by
+ omitting -o/--output and instead piping stdout to the file.
+ * rage-keygen now prints fatal errors directly instead of them
+ being hidden behind the RUST_LOG=error environment variable. It
+ also now sets its return code appropriately instead of always
+ returning 0.
+
-------------------------------------------------------------------
Tue Sep 26 03:59:43 UTC 2023 - William Brown
diff --git a/rage-encryption.spec b/rage-encryption.spec
index 81962a0..99a4e79 100644
--- a/rage-encryption.spec
+++ b/rage-encryption.spec
@@ -1,7 +1,7 @@
#
# spec file for package rage-encryption
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Name: rage-encryption
# This will be set by osc services, that will run after this.
-Version: 0.9.2+0
+Version: 0.10.0+0
Release: 0
Summary: X25519-based, simple, modern, and secure file encryption tool
# If you know the license, put it's SPDX string here.
@@ -32,7 +32,6 @@ Group: Productivity/Security
URL: https://github.com/str4d/rage
Source0: rage-%{version}.tar.gz
Source1: vendor.tar.zst
-Source2: cargo_config
%if %{suse_version} > 1500
BuildRequires: cargo-packaging
%endif
@@ -88,10 +87,7 @@ BuildArch: noarch
Zsh command-line completion support for %{name}.
%prep
-%setup -q -a 0 -n rage-%{version}
-%setup -q -n rage-%{version} -a 1 -D -T
-mkdir .cargo
-cp %{SOURCE2} .cargo/config
+%autosetup -a 1 -n rage-%{version}
%vendored_licenses_packager_prep
%build
@@ -103,25 +99,34 @@ cp %{SOURCE2} .cargo/config
cargo build %{build_args}
%endif
-cargo run --example generate-completions %{build_args}
-cargo run --example generate-docs %{build_args}
+%check
+%if %{suse_version} > 1500
+%{cargo_test} --features "mount"
+%else
+cargo test %{build_args}
+%endif
%install
-install -D -d -m 0755 %{buildroot}%{_bindir}
-install -m 0755 %{_builddir}/rage-%{version}/target/release/rage %{buildroot}%{_bindir}/rage
-install -m 0755 %{_builddir}/rage-%{version}/target/release/rage-keygen %{buildroot}%{_bindir}/rage-keygen
-install -m 0755 %{_builddir}/rage-%{version}/target/release/rage-keygen %{buildroot}%{_bindir}/rage-mount
+pushd target/release
+# Install each part of the tool and their respective completions.
for i in "" -keygen -mount; do
- install -D -p -m 644 target/manpages/rage$i.1.gz %{buildroot}/%{_mandir}/man1/rage$i.1%{?ext_man}
- install -D -p -m 644 target/completions/rage$i.bash %{buildroot}%{_datadir}/bash-completion/completions/rage$i
- install -D -p -m 644 target/completions/rage$i.zsh %{buildroot}%{_datadir}/zsh/site-functions/_rage$i
- install -D -p -m 644 target/completions/rage$i.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/rage$i.fish
-
+ install -D -m 0755 rage$i %{buildroot}%{_bindir}/rage$i
+ install -D -p -m 644 completions/rage$i.bash %{buildroot}%{_datadir}/bash-completion/completions/rage$i
+ install -D -p -m 644 completions/_rage$i %{buildroot}%{_datadir}/zsh/site-functions/_rage$i
+ install -D -p -m 644 completions/rage$i.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/rage$i.fish
done
-%vendored_licenses_packager_install
-%files
+pushd manpages
+mv es_AR es # es_AR doesn't seem to be a correct manpage locale
+find . -name "*.1.gz" -exec install -Dpm644 {} %{buildroot}%{_mandir}/{} \;
+popd
+popd
+
+%vendored_licenses_packager_install
+%find_lang rage{,-keygen,-mount} rage.lang --with-man --all-name
+
+%files -f rage.lang
%{_bindir}/rage
%{_bindir}/rage-keygen
%{_bindir}/rage-mount
diff --git a/vendor.tar.zst b/vendor.tar.zst
index e3204bb..4bd2a38 100644
--- a/vendor.tar.zst
+++ b/vendor.tar.zst
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4977cf5bab4d73b8d51f7df9fa0d72bf077922b25f9da05c2f51369b74cbec68
-size 33927832
+oid sha256:2d98291bc5a4c0ca9554d87830dca6684805568d1f2a5fe3c349e2fcc48c0f66
+size 26472522