fixup! .github(Fedora): Add docker build flows for Fedora

norihiro · Jun 1, 2024 · 05c4b8e · 05c4b8e
1 parent cfe3837
commit 05c4b8e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/.github/containers/fedora-common/build.sh b/.github/containers/fedora-common/build.sh
@@ -7,6 +7,7 @@ rpmbuild="$2"
 
 PLUGIN_NAME=$(awk '/^project\(/{print gensub(/project\(([^ ()]*).*/, "\\1", 1, $0)}' CMakeLists.txt)
 PLUGIN_NAME_FEDORA="$(sed -e 's/^obs-/obs-studio-plugin-/' <<< "$PLUGIN_NAME")"
+OBS_VERSION=$(docker run $docker_image bash -c 'rpm -q --qf "%{version}" obs-studio')
 eval $(git describe --tag --always --long | awk '
 BEGIN {
 	VERSION="unknown";
@@ -36,6 +37,7 @@ sed \
 	-e "s/@PLUGIN_NAME_FEDORA@/$PLUGIN_NAME_FEDORA/g" \
 	-e "s/@VERSION@/$VERSION/g" \
 	-e "s/@RELEASE@/$RELEASE/g" \
+	-e "s/@OBS_VERSION@/$OBS_VERSION/g" \
 	< ci/plugin.spec \
 	> $rpmbuild/SPECS/$PLUGIN_NAME_FEDORA.spec
 

diff --git a/.github/containers/fedora-template/Dockerfile b/.github/containers/fedora-template/Dockerfile
@@ -2,6 +2,7 @@ FROM fedora:%releasever%
 
 RUN dnf install -y rpm-build python3-dnf-plugins-core && dnf clean all
 RUN dnf install -y obs-studio obs-studio-devel cmake gcc gcc-c++ && dnf clean all
+RUN dnf install -y qt6-qtbase-devel qt6-qtbase-private-devel && dnf clean all
 
 RUN useradd -s /bin/bash -m rpm
 RUN echo >> /etc/sudoers

diff --git a/ci/plugin.spec b/ci/plugin.spec
@@ -5,8 +5,10 @@ Summary: OBS Studio plugin as video filters to track face for mainly a speaking
 License: GPLv3+
 
 Source0: %{name}-%{version}.tar.bz2
+Requires: obs-studio >= @OBS_VERSION@
 BuildRequires: cmake, gcc, gcc-c++
 BuildRequires: obs-studio-devel
+BuildRequires: qt6-qtbase-devel qt6-qtbase-private-devel
 
 %description
 This plugin tracks face of a person by detecting and tracking a face.