From 702a9dae0651394e018776cd006f3b19fb3f69b9 Mon Sep 17 00:00:00 2001
From: Armin Novak <armin.novak@thincast.com>
Date: Wed, 14 May 2025 16:48:10 +0200
Subject: [PATCH] [ci,rpm] fix rpm source file extraction

---
 packaging/rpm/freerdp-nightly.spec               |  7 +++++--
 packaging/scripts/create_rpm.sh                  | 12 +-----------
 packaging/scripts/prepare_rpm_freerdp-nightly.sh |  5 +++++
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/packaging/rpm/freerdp-nightly.spec b/packaging/rpm/freerdp-nightly.spec
index d09e97823..dd8ec496e 100644
--- a/packaging/rpm/freerdp-nightly.spec
+++ b/packaging/rpm/freerdp-nightly.spec
@@ -30,6 +30,7 @@ Url:            http://www.freerdp.com
 Group:          Productivity/Networking/Other
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        source_version
+Source2:        webview.tar.bz2
 BuildRequires: clang
 BuildRequires: cmake >= 3.13.0
 BuildRequires: libxkbfile-devel
@@ -149,9 +150,11 @@ based on freerdp and winpr.
 %setup -q
 cd %{_topdir}/BUILD
 %if 0%{?fedora} >= 41
-cp %{_topdir}/SOURCES/source_version freerdp-nightly-%{version}-build/.source_version
+cp %{_topdir}/SOURCES/source_version freerdp-nightly-%{version}-build/freerdp-nightly-3.0/.source_version
+tar xf %{_topdir}/SOURCES/webview.tar.bz2 -C freerdp-nightly-%{version}-build/freerdp-nightly-3.0/external/
 %else
-cp %{_topdir}/SOURCES/source_version freerdp-nightly-%{version}/.source_version
+cp %{_topdir}/SOURCES/source_version freerdp-nightly-%{version}/freerdp-nightly-3.0/.source_version
+tar xf %{_topdir}/SOURCES/webview.tar.bz2 -C freerdp-nightly-%{version}/freerdp-nightly-3.0/external/
 %endif
 
 %build
diff --git a/packaging/scripts/create_rpm.sh b/packaging/scripts/create_rpm.sh
index 66334e203..394c58d76 100755
--- a/packaging/scripts/create_rpm.sh
+++ b/packaging/scripts/create_rpm.sh
@@ -7,16 +7,6 @@ SCRIPT_PATH=$(realpath "$SCRIPT_PATH")
 mkdir -p ~/rpmbuild/SOURCES/
 $SCRIPT_PATH/prepare_rpm_freerdp-nightly.sh
 
-BASE_PREFIX="--prefix=freerdp-nightly-3.0/"
-FILES=""
-for dir in $(find external/webview -type d -not -path "external/webview/.git*"); do
-  FILES+=" $BASE_PREFIX$dir/"
-  for file in $(find $dir -maxdepth 1 -type f -not -path "$dir/.git*"); do
-    FILES+=" --add-file=$file"
-  done
-done
-FILES+=" $BASE_PREFIX"
-
-git archive --format=tar $FILES HEAD --output ~/rpmbuild/SOURCES/freerdp-nightly-3.0.tar.bz2
+git archive --format=tar --prefix=freerdp-nightly-3.0/ HEAD --output ~/rpmbuild/SOURCES/freerdp-nightly-3.0.tar.bz2
 cp source_version ~/rpmbuild/SOURCES/
 rpmbuild -ba "$SCRIPT_PATH/../rpm/freerdp-nightly.spec"
diff --git a/packaging/scripts/prepare_rpm_freerdp-nightly.sh b/packaging/scripts/prepare_rpm_freerdp-nightly.sh
index d11acc0b8..8fe5b4d6a 100755
--- a/packaging/scripts/prepare_rpm_freerdp-nightly.sh
+++ b/packaging/scripts/prepare_rpm_freerdp-nightly.sh
@@ -4,4 +4,9 @@ if [ ! -d external/webview ]; then
   git clone -b navigation-listener --depth=1 https://github.com/akallabeth/webview external/webview
 fi
 
+(
+	cd external/webview
+	git archive --format=tar --prefix=webview HEAD --output ~/rpmbuild/SOURCES/webview.tar.bz2
+)
+
 git rev-parse --short HEAD >source_version