From 8a7c07f747e39fbc2db4a5506e7f23492822b5b9 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Feb 11 2025 08:26:30 +0000 Subject: fix(?): only pre-apply patches when vendoring self this commit aims to fix an issue with building cosmic-greeter, and hopefully cosmic-edit Signed-off-by: Ryan Brue --- diff --git a/scripts/srpm.sh b/scripts/srpm.sh index 37dbc42..7ee5d27 100755 --- a/scripts/srpm.sh +++ b/scripts/srpm.sh @@ -56,14 +56,16 @@ COMMITDATE=$(git log -1 --format=%cd --date=format:%Y%m%d) COMMITDATESTRING=$(git log -1 --format=%cd --date=iso) if [ "$VENDOR" -eq 1 ]; then - for file in ../*.patch; do - # Check if the glob found any files - if [ -f "$file" ]; then - echo "Patching with $file" - # Add your processing commands here - git apply $file - fi - done + if [ "$VENDORSELF" -eq 1 ]; then + for file in ../*.patch; do + # Check if the glob found any files + if [ -f "$file" ]; then + echo "Patching with $file" + # Add your processing commands here + git apply $file + fi + done + fi echo "VENDOR=1" # Vendor dependencies and zip vendor