[rpms/bear] rawhide: Update to 4.1.4 (rhbz#2426948)

[rpms/bear] rawhide: Update to 4.1.4 (rhbz#2426948)

[Aleksei Bavshin]

A new commit has been pushed.

Repo   : rpms/bear
Branch : rawhide
Commit : 0af0bb7fa16ba9931f5f76fd59d1587477d49205
Author : Aleksei Bavshin <alebastr@fedoraproject.org>
Date   : 2026-06-02T21:24:42-07:00
Stats  : +50/-47 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/bear/c/0af0bb7fa16ba9931f5f76fd59d1587477d49205?branch=rawhide

Log:
Update to 4.1.4 (rhbz#2426948)

---
diff --git a/.gitignore b/.gitignore
index 6fe92ab..3f8cc13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
 /bear-3.1.5.tar.gz
 /bear-3.1.6.tar.gz
 /bear-4.0.4.tar.gz
+/bear-4.1.4.tar.gz

diff --git a/bear-fix-metadata.diff b/bear-fix-metadata.diff
index 882ea4f..44d722f 100644
--- a/bear-fix-metadata.diff
+++ b/bear-fix-metadata.diff
@@ -1,36 +1,24 @@
 diff --git a/Cargo.toml b/Cargo.toml
-index 3e13639..1dacb21 100644
+index fc1b0568..421d0c54 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -23,7 +23,7 @@ thiserror = "2.0"
+@@ -24,7 +24,7 @@ thiserror = "2.0"
  anyhow = "1.0"
  serde = { version = "1.0", default-features = false, features = ["derive"] }
  serde_json = { version = "1.0", default-features = false, features = ["std"] }
--serde_yml = "0.0.12"
-+serde_yml = { version = "0.9.42", package = "serde_norway" }
+-serde-saphyr = "0.0.27"
++serde-saphyr = { version = "0.9.34", package = "serde_yaml" }
  crossbeam-channel = { version = "0.5", default-features = false, features = ["std"] }
- clap = { version = "4.5", default-features = false, features = ["std", "cargo", "help", "usage", "suggestions"] }
- log = { version = "0.4", default-features = false, features = ["std"] }
-diff --git a/bear/Cargo.toml b/bear/Cargo.toml
-index 5371bc7..7419b4d 100644
---- a/bear/Cargo.toml
-+++ b/bear/Cargo.toml
-@@ -41,4 +41,4 @@ regex.workspace = true
- 
- [dev-dependencies]
- tempfile.workspace = true
+ clap = { version = "4.6", default-features = false, features = ["std", "cargo", "help", "usage", "suggestions"] }
+ clap_complete = { version = "4.6", default-features = false }
+@@ -42,7 +42,7 @@ cc = "1.2"
+ assert_cmd = "2.2"
+ assert_fs = "1.1"
+ predicates = "3.1"
 -mockall = "0.14"
 +mockall = ">=0.11.4,<0.15.0"
-diff --git a/intercept-preload/Cargo.toml b/intercept-preload/Cargo.toml
-index 820efd8..9d6a5e1 100644
---- a/intercept-preload/Cargo.toml
-+++ b/intercept-preload/Cargo.toml
-@@ -24,7 +24,7 @@ bear = { path = "../bear" }
- thiserror.workspace = true
- log.workspace = true
- env_logger.workspace = true
--ctor = { version = "0.4" }
-+ctor = { version = ">=0.4,<0.7" }
- 
- [target.'cfg(target_family = "unix")'.dependencies]
- libc.workspace = true
+ insta = "1.46"
+ proptest = "1.11"
+ encoding_rs = "0.8"
+-- 
+2.54.0

diff --git a/bear.spec b/bear.spec
index 1fa23ba..96ee4a4 100644
--- a/bear.spec
+++ b/bear.spec
@@ -1,36 +1,28 @@
 %bcond check    1
 
 Name:           bear
-Version:        4.0.4
+Version:        4.1.4
 Release:        %autorelease
 Summary:        Tool that generates a compilation database for clang tooling
 
-# (MIT OR Apache-2.0) AND Unicode-DFS-2016
 # Apache-2.0 OR BSL-1.0
 # Apache-2.0 OR MIT
-# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
 # GPL-3.0-or-later
 # MIT
 # MIT OR Apache-2.0
-# MPL-2.0
 # Unlicense OR MIT
 License:        %{shrink:
                 GPL-3.0-or-later
                 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 MIT
-                AND MPL-2.0
-                AND Unicode-DFS-2016
                 AND (Unlicense OR MIT)
                 }
 # LICENSE.dependencies contains a full license breakdown
 URL:            https://github.com/rizsotto/%{name}
 Source:         %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 # Manually created patch for downstream workspace metadata changes
-# * Replace serde_yml with a less cursed fork of serde_yaml.
-#   Upstream issue: https://github.com/rizsotto/Bear/issues/680
-# * Relax ctor dependency to >=0.4,<0.7
+# * Replace unpackaged serde_saphyr with serde_yaml
 # * Relax mockall dependency to >0.11.4,<0.15.0
 Patch:          bear-fix-metadata.diff
 
@@ -50,27 +42,44 @@ tooling.
 %prep
 %autosetup -n Bear-%{version} -p1
 %cargo_prep
-# Update wrapper paths (INSTALL.md#how-to-package)
-sed -i -e 's@/usr/local/libexec@%{_libexecdir}@' bear/build.rs
 
 %generate_buildrequires
 %cargo_generate_buildrequires
 
 %build
+export INTERCEPT_LIBDIR=%{_lib}
 %cargo_build
 %{cargo_license_summary}
 %{cargo_license} > LICENSE.dependencies
 
+target/rpm/generate-completions target/rpm/completions
+cat > target/rpm/bear <<ENTRY_SCRIPT
+#!/usr/bin/sh
+exec %{_libexecdir}/bear/bin/bear-driver "\$@"
+ENTRY_SCRIPT
+
 %install
-install -Dpm 0755 target/rpm/bear       -t %{buildroot}%{_bindir}
-install -Dpm 0755 target/rpm/wrapper    -t %{buildroot}%{_libexecdir}/bear
-install -Dpm 0755 target/rpm/libexec.so -t %{buildroot}%{_libexecdir}/bear/%{_lib}
-install -Dpm 0644 man/bear.1 -t %{buildroot}%{_mandir}/man1
+install -Dpm 0755 target/rpm/bear               -t %{buildroot}%{_bindir}
+install -Dpm 0755 target/rpm/bear-driver        -t %{buildroot}%{_libexecdir}/bear/bin
+install -Dpm 0755 target/rpm/bear-wrapper       -t %{buildroot}%{_libexecdir}/bear/bin
+install -Dpm 0755 target/rpm/libexec.so         -t %{buildroot}%{_libexecdir}/bear/%{_lib}
+install -Dpm 0644 target/rpm/completions/bear.bash %{buildroot}%{bash_completions_dir}/bear
+install -Dpm 0644 target/rpm/completions/bear.fish %{buildroot}%{fish_completions_dir}/bear.fish
+install -Dpm 0644 target/rpm/completions/_bear     %{buildroot}%{zsh_completions_dir}/_bear
+install -Dpm 0644 man/bear.1                    -t %{buildroot}%{_mandir}/man1
 
 %if %{with check}
 %check
-# We don't run the integration test suite, because it require rebuilding
-# the binaries with -f allow-integration-tests.
+export INTERCEPT_LIBDIR=%{_lib} BEAR_TEST_VERBOSE=1
+# Several cases fail if ccache wrappers are in the PATH.
+# This is not possible in koji, but quite annoying for local builds.
+cc_path=$(command -v gcc)
+if [ "$cc_path" != "${cc_path%/ccache*}" ]; then
+    cc_path=$(dirname "$cc_path")
+    export PATH="${PATH%"$cc_path:"*}${PATH##*"$cc_path:"}"
+fi
+unset cc_path
+
 %cargo_test
 %endif
 
@@ -81,9 +90,14 @@ install -Dpm 0644 man/bear.1 -t %{buildroot}%{_mandir}/man1
 %doc README.md
 %{_bindir}/bear
 %dir %{_libexecdir}/bear
+%dir %{_libexecdir}/bear/bin
 %dir %{_libexecdir}/bear/%{_lib}
-%{_libexecdir}/bear/wrapper
+%{_libexecdir}/bear/bin/bear-driver
+%{_libexecdir}/bear/bin/bear-wrapper
 %{_libexecdir}/bear/%{_lib}/libexec.so
+%{bash_completions_dir}/bear
+%{fish_completions_dir}/bear.fish
+%{zsh_completions_dir}/_bear
 %{_mandir}/man1/bear.1*
 
 %changelog

diff --git a/sources b/sources
index 6e9e54c..f3b83e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bear-4.0.4.tar.gz) = 67885fe178849c008d696ff7844a5aca248d96dce5b2856d5f9e413ae6900ed81649a8bcf823d85fe25c555d57eb229a26115afed0de83173019a4d1bc7854bf
+SHA512 (bear-4.1.4.tar.gz) = dc508e586e717909a65c3b586b6f3cb7adfb6468031ca89e9e766a0724755d688392ce37417ea5aea98b61569bde7451765444f704e643ef28476cbeadd5ff6f