fix(rpm): retain vendored Git source mappings

Signed-off-by: Evan Lezar <elezar@nvidia.com>

Author: elezar

.packit.yaml

@@ -27,8 +27,9 @@ actions:
     # Uses git ls-files + tar instead of git archive so the tarball
     # reflects any patching that Packit may have done (e.g. version bumps).
     - 'bash -c "VERSION=${PACKIT_PROJECT_VERSION} && TMPDIR=$(mktemp -d) && DIR=openshell-${VERSION} && mkdir -p ${TMPDIR}/${DIR} && git ls-files -z | xargs -0 tar cf - | tar xf - -C ${TMPDIR}/${DIR}/ && tar -czf openshell-${VERSION}.tar.gz -C ${TMPDIR} ${DIR} && rm -rf ${TMPDIR}"'
-    # Step 2: Create vendored Cargo dependencies tarball for offline RPM build.
-    - 'bash -c "VERSION=${PACKIT_PROJECT_VERSION} && CARGO_HTTP_TIMEOUT=600 CARGO_NET_RETRY=5 cargo vendor --locked --quiet && tar -cJf openshell-${VERSION}-vendor.tar.xz vendor/ && rm -rf vendor/"'
+    # Step 2: Preserve Cargo source replacements, including Git dependencies,
+    # alongside vendored crates for the offline RPM build.
+    - 'bash -c "VERSION=${PACKIT_PROJECT_VERSION} && CARGO_HTTP_TIMEOUT=600 CARGO_NET_RETRY=5 cargo vendor --locked > cargo-vendor-config.toml && tar -cJf openshell-${VERSION}-vendor.tar.xz vendor/ cargo-vendor-config.toml && rm -rf vendor/ cargo-vendor-config.toml"'
     # Step 3: Return the primary archive name. Packit expects create-archive
     # to print one path for Source0; Source1 is patched explicitly below.
     - 'bash -c "echo openshell-${PACKIT_PROJECT_VERSION}.tar.gz"'

openshell.spec

@@ -86,7 +86,10 @@ management, agent execution, and provider access via gRPC.
 
 # Extract vendored Cargo dependencies and configure offline build
 tar xf %{SOURCE1}
-%cargo_prep -v vendor
+# Retain RPM build settings, then use Cargo's complete source mapping.
+# The -v macro redirects crates.io only and omits vendored Git sources.
+%cargo_prep -N
+cat cargo-vendor-config.toml >> .cargo/config.toml
 
 # Patch workspace version from placeholder to actual build identity.
 sed -i 's/^version = "0.0.0"/version = "%{openshell_cargo_version}"/' Cargo.toml