morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[ci,rpm] fix rpm source file extraction

Browse Source
This commit is contained in:
Armin Novak
2025-05-14 16:48:10 +02:00
parent 61b59c3146
commit 702a9dae06
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packaging/rpm/freerdp-nightly.spec
View File

@@ -30,6 +30,7 @@ Url: http://www.freerdp.com
Group: Productivity/Networking/Other Group: Productivity/Networking/Other
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
Source1: source_version Source1: source_version
Source2: webview.tar.bz2
BuildRequires: clang BuildRequires: clang
BuildRequires: cmake >= 3.13.0 BuildRequires: cmake >= 3.13.0
BuildRequires: libxkbfile-devel BuildRequires: libxkbfile-devel
@@ -149,9 +150,11 @@ based on freerdp and winpr.
%setup -q %setup -q
cd %{_topdir}/BUILD cd %{_topdir}/BUILD
%if 0%{?fedora} >= 41 %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 %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 %endif
%build %build

12
packaging/scripts/create_rpm.sh
View File

@@ -7,16 +7,6 @@ SCRIPT_PATH=$(realpath "$SCRIPT_PATH")
mkdir -p ~/rpmbuild/SOURCES/ mkdir -p ~/rpmbuild/SOURCES/
$SCRIPT_PATH/prepare_rpm_freerdp-nightly.sh $SCRIPT_PATH/prepare_rpm_freerdp-nightly.sh
BASE_PREFIX="--prefix=freerdp-nightly-3.0/" git archive --format=tar --prefix=freerdp-nightly-3.0/ HEAD --output ~/rpmbuild/SOURCES/freerdp-nightly-3.0.tar.bz2
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
cp source_version ~/rpmbuild/SOURCES/ cp source_version ~/rpmbuild/SOURCES/
rpmbuild -ba "$SCRIPT_PATH/../rpm/freerdp-nightly.spec" rpmbuild -ba "$SCRIPT_PATH/../rpm/freerdp-nightly.spec"

5
packaging/scripts/prepare_rpm_freerdp-nightly.sh
View File

@@ -4,4 +4,9 @@ if [ ! -d external/webview ]; then
git clone -b navigation-listener --depth=1 https://github.com/akallabeth/webview external/webview git clone -b navigation-listener --depth=1 https://github.com/akallabeth/webview external/webview
fi fi
(
cd external/webview
git archive --format=tar --prefix=webview HEAD --output ~/rpmbuild/SOURCES/webview.tar.bz2
)
git rev-parse --short HEAD >source_version git rev-parse --short HEAD >source_version