Accepting request 1332153 from devel:tools:scm

OBS-URL: https://build.opensuse.org/request/show/1332153
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jujutsu?expand=0&rev=31

_service

@@ -1,10 +1,10 @@
 <services>
   <service name="obs_scm" mode="manual">
-    <param name="url">https://github.com/martinvonz/jj</param>
+    <param name="url">https://github.com/jj-vcs/jj</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
+    <param name="revision">v0.38.0</param>
     <param name="versionformat">@PARENT_TAG@</param>
-    <param name="revision">v0.22.0</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="changesgenerate">disable</param>
     <param name="filename">jujutsu</param>
@@ -12,7 +12,8 @@
   <service name="set_version" mode="manual">
   </service>
   <service name="cargo_vendor" mode="manual">
-    <param name="update">true</param>
+    <param name="update">false</param>
+    <param name="respect-lockfile">true</param>
     <param name="srcdir">jj</param>
   </service>
   <service name="tar" mode="buildtime"/>

jujutsu-0.22.0.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ddfbcdd0dc1005aaf6226a26a3ed6f42beff4a7868e844b21ca478a304f9b68f
-size 7652877

jujutsu-0.38.0.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f711b5cad33d871ede771f4f9f0691875c73bf253f695e6b7d1c823f6d3e8790
+size 11321357

jujutsu.obsinfo

@@ -1,4 +1,4 @@
 name: jujutsu
-version: 0.22.0
-mtime: 1727889920
-commit: 67c2ae0a9e3e445f034a456b299e3f37c4dc4b93
+version: 0.38.0
+mtime: 1770276670
+commit: 2508982cde5c7e4db0933e0b6469f9e778e71e28

jujutsu.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package jujutsu
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2026 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,23 +19,33 @@
 %define binary_name jj
 
 Name:           jujutsu
-Version:        0.22.0
+Version:        0.38.0
 Release:        0
 Summary:        Git-compatible DVCS that is both simple and powerful
 License:        MIT
-URL:            https://github.com/martinvonz/jj
+URL:            https://github.com/jj-vcs/jj
 Source0:        %{name}-%{version}.tar.gz
 Source1:        vendor.tar.zst
-BuildRequires:  cargo >= 1.76
+BuildRequires:  cargo >= 1.89
 BuildRequires:  cargo-packaging
+BuildRequires:  git-core
 BuildRequires:  gnupg
+BuildRequires:  gpgme
 BuildRequires:  openssh-common
-BuildRequires:  openssl-devel
-BuildRequires:  zstd
+# dependencies for completion subpackages
+BuildRequires:  bash-completion
+BuildRequires:  fish
+BuildRequires:  zsh
 
 # serde_bser fails to compile on s390x
 # error[E0599]: no method named `put_f64_be` found for struct `Vec<u8>` in the current scope
-ExcludeArch:    s390x
+#
+# armv7l
+# rustc-LLVM ERROR: out of memory
+#
+# i586
+# rustc-LLVM ERROR: out of memory
+ExcludeArch:    i586 s390x armv7hl armv7l armv7l:armv6l:armv5tel armv6hl
 
 %description
 Jujutsu is a Git-compatible DVCS. It combines features from Git (data model,
@@ -59,6 +69,37 @@ stable, and most developers use it daily for all their needs, there may still
 be work-in-progress features, suboptimal UX, and workflow gaps that make it
 unusable for your particular use.
 
+%package -n %{name}-bash-completion
+Summary:        Bash Completion for %{name}
+Group:          System/Shells
+Requires:       %{name} = %{version}
+Requires:       bash-completion
+Supplements:    (%{name} and bash-completion)
+BuildArch:      noarch
+
+%description -n %{name}-bash-completion
+Bash command line completion support for %{name}.
+
+%package -n %{name}-fish-completion
+Summary:        Fish Completion for %{name}
+Group:          System/Shells
+Requires:       %{name} = %{version}
+Supplements:    (%{name} and fish)
+BuildArch:      noarch
+
+%description -n %{name}-fish-completion
+Fish command line completion support for %{name}.
+
+%package -n %{name}-zsh-completion
+Summary:        Zsh Completion for %{name}
+Group:          System/Shells
+Requires:       %{name} = %{version}
+Supplements:    (%{name} and zsh)
+BuildArch:      noarch
+
+%description -n %{name}-zsh-completion
+zsh command line completion support for %{name}.
+
 %prep
 %autosetup -p 1 -a 1
 
@@ -69,13 +110,41 @@ unusable for your particular use.
 install -D -d -m 0755 %{buildroot}%{_bindir}
 install -m 0755 %{_builddir}/%{name}-%{version}/target/release/%{binary_name} %{buildroot}%{_bindir}/%{binary_name}
 
+# create the bash completion file
+mkdir -p %{buildroot}%{_datarootdir}/bash-completion/completions/
+%{buildroot}/%{_bindir}/%{binary_name} util completion bash > %{buildroot}%{_datarootdir}/bash-completion/completions/%{binary_name}
+
+# create the fish completion file
+mkdir -p %{buildroot}%{_datarootdir}/fish/vendor_completions.d/
+%{buildroot}/%{_bindir}/%{binary_name} util completion fish > %{buildroot}%{_datarootdir}/fish/vendor_completions.d/%{binary_name}.fish
+
+# create the zsh completion file
+mkdir -p %{buildroot}%{_datarootdir}/zsh/site-functions/
+%{buildroot}/%{_bindir}/%{binary_name} util completion zsh > %{buildroot}%{_datarootdir}/zsh/site-functions/_%{binary_name}
+
 %check
+%{buildroot}/%{_bindir}/%{binary_name} --version | grep %{version}
 rm -rf tests/contest/
-%{cargo_test}
+
+# Failing tests reported upstream
+# https://github.com/jj-vcs/jj/issues/6241
+%{cargo_test} -- \
+        --skip 'test_gpg::gpgsm_signing_roundtrip' \
+        --skip 'test_gpg::gpgsm_signing_roundtrip_explicit_key' \
+        --skip 'test_gpg::gpgsm_unknown_key'
 
 %files
 %doc README.md
 %license LICENSE
 %{_bindir}/%{binary_name}
 
+%files -n %{name}-bash-completion
+%{_datarootdir}/bash-completion/completions/%{binary_name}
+
+%files -n %{name}-fish-completion
+%{_datarootdir}/fish/vendor_completions.d/%{binary_name}.fish
+
+%files -n %{name}-zsh-completion
+%{_datarootdir}/zsh/site-functions/_%{binary_name}
+
 %changelog

vendor.tar.zst

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7cda8f0abc00e59e92d5d661d46e69333f92c39e733afcc3fe149036dc5eb65
-size 39986467
+oid sha256:331f2cdc3c20797f6b0246d22b2b754d3feddcda9db45a773f3619058488126b
+size 39687706