[rpms/scipy] rawhide: Use PyPI sdist tarball to avoid manually crafted git submodules tarball

[rpms/scipy] rawhide: Use PyPI sdist tarball to avoid manually crafted git submodules tarball

[@ 2026-07-31 19:28 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/scipy
Branch : rawhide
Commit : 2e80d8769d4094d7816cb40ea6787404afab39d0
Author : Miro Hrončok <miro@hroncok.cz>
Date   : 2026-07-31T11:53:54+02:00
Stats  : +3/-40 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/scipy/c/2e80d8769d4094d7816cb40ea6787404afab39d0?branch=rawhide

Log:
Use PyPI sdist tarball to avoid manually crafted git submodules tarball

---
diff --git a/archive-submodules.sh b/archive-submodules.sh
deleted file mode 100755
index 3b72f00..0000000
--- a/archive-submodules.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-# This script was vibe coded through Claude.
-set -euo pipefail
-
-output="${1:-submodules.tar.gz}"
-
-cd "$(git rev-parse --show-toplevel)"
-
-git submodule update --init --recursive --quiet
-
-paths=()
-while IFS= read -r p; do
-    paths+=("$p")
-done < <(git submodule foreach --quiet --recursive 'echo "$displaypath"')
-
-if [[ ${#paths[@]} -eq 0 ]]; then
-    echo "No submodules found." >&2
-    exit 1
-fi
-
-tmpdir=$(mktemp -d)
-trap 'rm -rf "$tmpdir"' EXIT
-
-combined="$tmpdir/combined.tar"
-tar cf "$combined" --files-from /dev/null
-
-for sm_path in "${paths[@]}"; do
-    git -C "$sm_path" archive --prefix="$sm_path/" HEAD > "$tmpdir/sm.tar"
-    tar -Af "$combined" "$tmpdir/sm.tar"
-done
-
-gzip -c "$combined" > "$output"
-echo "Created $output with ${#paths[@]} submodule(s)."

diff --git a/scipy.spec b/scipy.spec
index 52ee970..735cdff 100644
--- a/scipy.spec
+++ b/scipy.spec
@@ -68,10 +68,7 @@ Release:    1%{?dist}
 # LicenseRef-Fedora-Public-Domain -- scipy/odr/__odrpack.c
 License:    BSD-3-Clause AND BSD-2-Clause AND MIT AND BSL-1.0 AND Boehm-GC AND Qhull AND LicenseRef-Fedora-Public-Domain
 Url:        https://scipy.org/
-Source0:    https://github.com/scipy/scipy/releases/download/v%{version}/scipy-%{version}.tar.gz
-# Execute `archive-submodules.sh submodules-{version}.tar.gz` (stored in downstream sources) inside
-# upstream git directory to generate `submodules-{version}.tar.gz`
-Source1:    submodules-%{version}.tar.gz
+Source:     %{pypi_source scipy}
 
 BuildRequires: %{blaslib}-devel
 BuildRequires: gcc-gfortran, gcc-c++
@@ -147,7 +144,7 @@ Scipy test files
 %endif
 
 %prep
-%autosetup -p1 -n %{name}-%{version}%{?rcver} -a 1
+%autosetup -p1 -n %{name}-%{version}%{?rcver}
 
 %if %{without pythran}
 # Remove pythran dependency if not explicitly required

diff --git a/sources b/sources
index df7fd41..3d37394 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (scipy-1.18.0.tar.gz) = facd6ba4eb6f3306bc6fe585c2e3e876649fd0050506ccc3d89eada308845d8756755c6de32b573c2d2a4705d469c3df6bffd9d2b448f83b2d98386eaefc6b88
-SHA512 (submodules-1.18.0.tar.gz) = c3b07125fe84b627790e29cf3c72d0d038bb23af50e68b3b4bff6f7a18defc32307740562864a91050c08929745dfed3ee661a0b3c3b3360294be51717a33a54
+SHA512 (scipy-1.18.0.tar.gz) = 77ae3bb64f08fa3f204a8187b4f319f73daea60b8b05bad5564c3809a33aeb091160a6d3e2c7b8e4a5a35202c6c9c3a7d8bc0098332c4c01623eb06ba613bbf3