From 30ab5d5e817fe4626cfe3e9e40e0b2443bae948c Mon Sep 17 00:00:00 2001
From: Gauvino <68083474+Gauvino@users.noreply.github.com>
Date: Sun, 21 Jan 2024 18:55:01 +0100
Subject: [PATCH] Fix action building (#10899)

* Fix action building

* Added required package
---
 deployment/Dockerfile.centos.amd64 |  6 +++---
 deployment/build.centos.amd64      | 12 ++++++------
 deployment/build.debian.amd64      |  8 +-------
 deployment/build.debian.arm64      |  8 +-------
 deployment/build.debian.armhf      |  8 +-------
 deployment/build.fedora.amd64      |  2 +-
 deployment/build.ubuntu.amd64      |  8 +-------
 deployment/build.ubuntu.arm64      |  8 +-------
 deployment/build.ubuntu.armhf      |  8 +-------
 9 files changed, 16 insertions(+), 52 deletions(-)

diff --git a/deployment/Dockerfile.centos.amd64 b/deployment/Dockerfile.centos.amd64
index 3db184f494..af309b0831 100644
--- a/deployment/Dockerfile.centos.amd64
+++ b/deployment/Dockerfile.centos.amd64
@@ -11,11 +11,11 @@ ENV IS_DOCKER=YES
 
 # Prepare CentOS environment
 RUN dnf update -yq \
- && dnf install -yq epel-release \
  && dnf install -yq \
-    rpmdevtools libcurl-devel fontconfig-devel \
+    @buildsys-build rpmdevtools git \
+    dnf-plugins-core libcurl-devel fontconfig-devel \
     freetype-devel openssl-devel glibc-devel \
-    libicu-devel git wget dnf-plugins-core \
+    libicu-devel systemd wget make \
  && dnf clean all \
  && rm -rf /var/cache/dnf
 
diff --git a/deployment/build.centos.amd64 b/deployment/build.centos.amd64
index af73e31533..26be377f10 100755
--- a/deployment/build.centos.amd64
+++ b/deployment/build.centos.amd64
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#= CentOS/RHEL 8+ amd64 .rpm
+#= CentOS/RHEL 9+ amd64 .rpm
 
 set -o errexit
 set -o xtrace
@@ -10,7 +10,7 @@ pushd "${SOURCE_DIR}"
 
 if [[ ${IS_DOCKER} == YES ]]; then
     # Remove BuildRequires for dotnet, since it's installed manually
-    pushd fedora
+    pushd centos
 
     cp -a jellyfin.spec /tmp/spec.orig
     sed -i 's/BuildRequires:  dotnet/# BuildRequires:  dotnet/' jellyfin.spec
@@ -20,7 +20,7 @@ fi
 
 # Modify changelog to unstable configuration if IS_UNSTABLE
 if [[ ${IS_UNSTABLE} == 'yes' ]]; then
-    pushd fedora
+    pushd centos
 
     PR_ID=$( git log --grep 'Merge pull request' --oneline --single-worktree --first-parent | head -1 | grep --color=none -Eo '#[0-9]+' | tr -d '#' )
 
@@ -35,7 +35,7 @@ EOF
 fi
 
 # Build RPM
-make -f fedora/Makefile srpm outdir=/root/rpmbuild/SRPMS
+make -f centos/Makefile srpm outdir=/root/rpmbuild/SRPMS
 rpmbuild --rebuild -bb /root/rpmbuild/SRPMS/jellyfin-*.src.rpm
 
 # Move the artifacts out
@@ -45,10 +45,10 @@ if [[ ${IS_DOCKER} == YES ]]; then
     chown -Rc "$(stat -c %u:%g "${ARTIFACT_DIR}")" "${ARTIFACT_DIR}"
 fi
 
-rm -f fedora/jellyfin*.tar.gz
+rm -f centos/jellyfin*.tar.gz
 
 if [[ ${IS_DOCKER} == YES ]]; then
-    pushd fedora
+    pushd centos
 
     cp -a /tmp/spec.orig jellyfin.spec
     chown -Rc "$(stat -c %u:%g "${ARTIFACT_DIR}")" "${ARTIFACT_DIR}"
diff --git a/deployment/build.debian.amd64 b/deployment/build.debian.amd64
index 85776ad6a0..350b22a854 100755
--- a/deployment/build.debian.amd64
+++ b/deployment/build.debian.amd64
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#= Debian 10+ amd64 .deb
+#= Debian 12+ amd64 .deb
 
 set -o errexit
 set -o xtrace
@@ -8,12 +8,6 @@ set -o xtrace
 # Move to source directory
 pushd "${SOURCE_DIR}"
 
-if [[ ${IS_DOCKER} == YES ]]; then
-    # Remove build-dep for dotnet-sdk-8.0, since it's installed manually
-    cp -a debian/control /tmp/control.orig
-    sed -i '/dotnet-sdk-8.0,/d' debian/control
-fi
-
 # Modify changelog to unstable configuration if IS_UNSTABLE
 if [[ ${IS_UNSTABLE} == 'yes' ]]; then
     pushd debian
diff --git a/deployment/build.debian.arm64 b/deployment/build.debian.arm64
index d37cc5a64a..0dfca0ab49 100755
--- a/deployment/build.debian.arm64
+++ b/deployment/build.debian.arm64
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#= Debian 10+ arm64 .deb
+#= Debian 12+ arm64 .deb
 
 set -o errexit
 set -o xtrace
@@ -8,12 +8,6 @@ set -o xtrace
 # Move to source directory
 pushd "${SOURCE_DIR}"
 
-if [[ ${IS_DOCKER} == YES ]]; then
-    # Remove build-dep for dotnet-sdk-8.0, since it's installed manually
-    cp -a debian/control /tmp/control.orig
-    sed -i '/dotnet-sdk-8.0,/d' debian/control
-fi
-
 # Modify changelog to unstable configuration if IS_UNSTABLE
 if [[ ${IS_UNSTABLE} == 'yes' ]]; then
     pushd debian
diff --git a/deployment/build.debian.armhf b/deployment/build.debian.armhf
index f3505b1478..0ab9e2f9a4 100755
--- a/deployment/build.debian.armhf
+++ b/deployment/build.debian.armhf
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#= Debian 10+ arm64 .deb
+#= Debian 12+ arm64 .deb
 
 set -o errexit
 set -o xtrace
@@ -8,12 +8,6 @@ set -o xtrace
 # Move to source directory
 pushd "${SOURCE_DIR}"
 
-if [[ ${IS_DOCKER} == YES ]]; then
-    # Remove build-dep for dotnet-sdk-8.0, since it's installed manually
-    cp -a debian/control /tmp/control.orig
-    sed -i '/dotnet-sdk-8.0,/d' debian/control
-fi
-
 # Modify changelog to unstable configuration if IS_UNSTABLE
 if [[ ${IS_UNSTABLE} == 'yes' ]]; then
     pushd debian
diff --git a/deployment/build.fedora.amd64 b/deployment/build.fedora.amd64
index 21859cbf9f..2b4ec2a9c5 100755
--- a/deployment/build.fedora.amd64
+++ b/deployment/build.fedora.amd64
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#= Fedora 29+ amd64 .rpm
+#= Fedora 39+ amd64 .rpm
 
 set -o errexit
 set -o xtrace
diff --git a/deployment/build.ubuntu.amd64 b/deployment/build.ubuntu.amd64
index 3658676035..6fd87a3aec 100755
--- a/deployment/build.ubuntu.amd64
+++ b/deployment/build.ubuntu.amd64
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#= Ubuntu 18.04+ amd64 .deb
+#= Ubuntu 22.04+ amd64 .deb
 
 set -o errexit
 set -o xtrace
@@ -8,12 +8,6 @@ set -o xtrace
 # Move to source directory
 pushd "${SOURCE_DIR}"
 
-if [[ ${IS_DOCKER} == YES ]]; then
-    # Remove build-dep for dotnet-sdk-8.0, since it's installed manually
-    cp -a debian/control /tmp/control.orig
-    sed -i '/dotnet-sdk-8.0,/d' debian/control
-fi
-
 # Modify changelog to unstable configuration if IS_UNSTABLE
 if [[ ${IS_UNSTABLE} == 'yes' ]]; then
     pushd debian
diff --git a/deployment/build.ubuntu.arm64 b/deployment/build.ubuntu.arm64
index 8cf24b955f..f783941c73 100755
--- a/deployment/build.ubuntu.arm64
+++ b/deployment/build.ubuntu.arm64
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#= Ubuntu 18.04+ arm64 .deb
+#= Ubuntu 22.04+ arm64 .deb
 
 set -o errexit
 set -o xtrace
@@ -8,12 +8,6 @@ set -o xtrace
 # Move to source directory
 pushd "${SOURCE_DIR}"
 
-if [[ ${IS_DOCKER} == YES ]]; then
-    # Remove build-dep for dotnet-sdk-8.0, since it's installed manually
-    cp -a debian/control /tmp/control.orig
-    sed -i '/dotnet-sdk-8.0,/d' debian/control
-fi
-
 # Modify changelog to unstable configuration if IS_UNSTABLE
 if [[ ${IS_UNSTABLE} == 'yes' ]]; then
     pushd debian
diff --git a/deployment/build.ubuntu.armhf b/deployment/build.ubuntu.armhf
index 896486dcd4..cde6708c5b 100755
--- a/deployment/build.ubuntu.armhf
+++ b/deployment/build.ubuntu.armhf
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#= Ubuntu 18.04+ arm64 .deb
+#= Ubuntu 22.04+ arm64 .deb
 
 set -o errexit
 set -o xtrace
@@ -8,12 +8,6 @@ set -o xtrace
 # Move to source directory
 pushd "${SOURCE_DIR}"
 
-if [[ ${IS_DOCKER} == YES ]]; then
-    # Remove build-dep for dotnet-sdk-8.0, since it's installed manually
-    cp -a debian/control /tmp/control.orig
-    sed -i '/dotnet-sdk-8.0,/d' debian/control
-fi
-
 # Modify changelog to unstable configuration if IS_UNSTABLE
 if [[ ${IS_UNSTABLE} == 'yes' ]]; then
     pushd debian