[rpms/rust-tame-index] epel10.3: Update gix dependency to 0.66

[rpms/rust-tame-index] epel10.3: Update gix dependency to 0.66

[blinxen]

A new commit has been pushed.

Repo   : rpms/rust-tame-index
Branch : epel10.3
Commit : ec77df31df5b1298114bc3346b6f676f7cf93f78
Author : blinxen <h-k-81@hotmail.com>
Date   : 2024-09-18T21:12:35+02:00
Stats  : +102/-5 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-tame-index/c/ec77df31df5b1298114bc3346b6f676f7cf93f78?branch=epel10.3

Log:
Update gix dependency to 0.66

---
diff --git a/gix-compatibility.patch b/gix-compatibility.patch
new file mode 100644
index 0000000..5fccab2
--- /dev/null
+++ b/gix-compatibility.patch
@@ -0,0 +1,85 @@
+--- tame-index-0.12.0/src/index/git_remote.rs
++++ tame-index-0.12.0/src/index/git_remote.rs
+@@ -352,12 +352,12 @@ impl RemoteGitIndex {
+
+         let mut config = self.repo.config_snapshot_mut();
+         config
+-            .set_raw_value("committer", None, "name", "tame-index")
++            .set_raw_value(&"committer.name", "tame-index")
+             .map_err(GitError::from)?;
+         // Note we _have_ to set the email as well, but luckily gix does not actually
+         // validate if it's a proper email or not :)
+         config
+-            .set_raw_value("committer", None, "email", "")
++            .set_raw_value(&"committer.email", "")
+             .map_err(GitError::from)?;
+
+         let repo = config
+--- tame-index-0.12.0/tests/git.rs
++++ tame-index-0.12.0/tests/git.rs
+@@ -147,7 +147,7 @@ impl TreeUpdateBuilder {
+ ///
+ /// 1. Using the crates.io git registry. It's massive and slow.
+ /// 2. Using some other external git registry, could fail for any number of
+-/// network etc related issues
++///     network etc related issues
+ /// 3. Needing to maintain a blessed remote of any kind
+ struct FakeRemote {
+     repo: gix::Repository,
+@@ -166,7 +166,7 @@ impl FakeRemote {
+         // Create an empty initial commit so we always have _something_
+         let parent = {
+             let empty_tree_id = repo
+-                .write_object(&gix::objs::Tree::empty())
++                .write_object(gix::objs::Tree::empty())
+                 .unwrap()
+                 .detach();
+
+@@ -193,22 +193,20 @@ impl FakeRemote {
+     fn snapshot(repo: &mut gix::Repository) -> gix::config::CommitAutoRollback<'_> {
+         let mut config = repo.config_snapshot_mut();
+         config
+-            .set_raw_value("author", None, "name", "Integration Test")
++            .set_raw_value(&"author.name", "Integration Test")
+             .unwrap();
+         config
+-            .set_raw_value("committer", None, "name", "Integration Test")
++            .set_raw_value(&"committer.name", "Integration Test")
+             .unwrap();
+         config
+-            .set_raw_value("author", None, "email", "tests@integration.se")
++            .set_raw_value(&"author.email", "tests@integration.se")
+             .unwrap();
+         config
+-            .set_raw_value("committer", None, "email", "tests@integration.se")
++            .set_raw_value(&"committer.email", "tests@integration.se")
+             .unwrap();
+
+         // Disable GPG signing, it breaks testing if the user has it enabled
+-        config
+-            .set_raw_value("commit", None, "gpgsign", "false")
+-            .unwrap();
++        config.set_raw_value(&"commit.gpgsign", "false").unwrap();
+
+         config.commit_auto_rollback().unwrap()
+     }
+@@ -483,7 +481,7 @@ fn non_main_local_branch() {
+         let commit = {
+             let snap = FakeRemote::snapshot(&mut repo);
+             let empty_tree_id = snap
+-                .write_object(&gix::objs::Tree::empty())
++                .write_object(gix::objs::Tree::empty())
+                 .unwrap()
+                 .detach();
+
+--- tame-index-0.12.0/tests/git.rs
++++ tame-index-0.12.0/tests/git.rs
+@@ -507,7 +507,7 @@ fn non_main_local_branch() {
+                         message: "".into(),
+                     },
+                     expected: tx::PreviousValue::Any,
+-                    new: gix::refs::Target::Peeled(commit),
++                    new: gix::refs::Target::Object(commit),
+                 },
+                 name: "refs/heads/master".try_into().unwrap(),
+                 deref: false,

diff --git a/rust-tame-index.spec b/rust-tame-index.spec
index 284a140..feca1f9 100644
--- a/rust-tame-index.spec
+++ b/rust-tame-index.spec
@@ -13,8 +13,11 @@ License:        Apache-2.0 OR MIT
 URL:            https://crates.io/crates/tame-index
 Source:         %{crates_source}
 # Manually created patch for downstream crate metadata changes
+# * Bump gix to version 0.66
 # * remove unused benchmark-only tiny-bench dev-dependency
 Patch:          tame-index-fix-metadata.diff
+# See https://github.com/EmbarkStudios/tame-index/commit/033b9d1e4187b9b967068adef283a40c86727ce6
+Patch:          gix-compatibility.patch
 
 BuildRequires:  cargo-rpm-macros >= 24
 

diff --git a/tame-index-fix-metadata.diff b/tame-index-fix-metadata.diff
index d6c9e24..de09259 100644
--- a/tame-index-fix-metadata.diff
+++ b/tame-index-fix-metadata.diff
@@ -1,17 +1,26 @@
 --- tame-index-0.12.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ tame-index-0.12.0/Cargo.toml	2024-07-07T08:44:55.221276+00:00
-@@ -30,11 +30,6 @@
- 
++++ tame-index-0.12.0/Cargo.toml	2024-09-12T18:15:02.968224+00:00
+@@ -31,11 +31,6 @@
  [profile.dev.package.sha2]
  opt-level = 3
--
+ 
 -[[bench]]
 -name = "sparse"
 -harness = false
 -required-features = ["sparse"]
- 
+-
  [dependencies.bytes]
  version = "1.4"
+ optional = true
+@@ -48,7 +43,7 @@
+ optional = true
+ 
+ [dependencies.gix]
+-version = "0.63"
++version = "0.66"
+ features = ["blocking-http-transport-reqwest"]
+ optional = true
+ default-features = false
 @@ -128,9 +123,6 @@
  [dev-dependencies.tempfile]
  version = "3.6"