Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove the SPEC edit hack, replace with proper repos (#7)

Browse Source 
* Remove the SPEC edit hack, replace with proper repos

Signed-off-by: Thomas Büttner <thomas@vergesslicher.tech>

* Fix bad rpmbuild flag

Signed-off-by: Thomas Büttner <thomas@vergesslicher.tech>
This commit is contained in:
Thomas Büttner 2019-10-29 23:16:08 +01:00 committed by Joshua M. Boniface
parent 53ee78170a
commit e6e9cd8ce2
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
deployment/centos-package-x64/Dockerfile
View File

@ -13,13 +13,12 @@ RUN yum update -y \
&& yum install -y epel-release && yum install -y epel-release
# Install build dependencies # Install build dependencies
RUN yum install -y @buildsys-build rpmdevtools yum-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel wget git RUN yum install -y @buildsys-build rpmdevtools yum-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel git
# Install recent NodeJS and Yarn # Install recent NodeJS and Yarn
RUN wget -O- https://raw.githubusercontent.com/creationix/nvm/v0.35.0/install.sh | /bin/bash \ RUN curl -fSsLo /etc/yum.repos.d/yarn.repo https://dl.yarnpkg.com/rpm/yarn.repo \
&& source "$HOME/.nvm/nvm.sh" \ && rpm -i https://rpm.nodesource.com/pub_8.x/el/7/x86_64/nodesource-release-el7-1.noarch.rpm \
&& nvm install v8 \ && yum install -y yarn
&& npm install -g yarn
# Install DotNET SDK # Install DotNET SDK
RUN rpm -Uvh https://packages.microsoft.com/config/rhel/7/packages-microsoft-prod.rpm \ RUN rpm -Uvh https://packages.microsoft.com/config/rhel/7/packages-microsoft-prod.rpm \

12
deployment/centos-package-x64/docker-build.sh
View File

@ -8,17 +8,9 @@ set -o xtrace
# Move to source directory # Move to source directory
pushd ${SOURCE_DIR} pushd ${SOURCE_DIR}
# Prepare the source # Build RPM
source "$HOME/.nvm/nvm.sh"
nvm use v8
make -f .copr/Makefile srpm outdir=/root/rpmbuild/SRPMS make -f .copr/Makefile srpm outdir=/root/rpmbuild/SRPMS
rpmbuild --rebuild -bb /root/rpmbuild/SRPMS/jellyfin-*.src.rpm
# Remove dep for nodejs/yarn since our build env won't have these (NVM instead)
sed -i '/BuildRequires: nodejs >= 8 yarn/d' SPECS/jellyfin.spec
# Build the RPMs
rpmbuild -bs SPECS/jellyfin.spec --define "_sourcedir ${SOURCE_DIR}/SOURCES/pkg-src/"
rpmbuild -bb SPECS/jellyfin.spec --define "_sourcedir ${SOURCE_DIR}/SOURCES/pkg-src/"
# Move the artifacts out # Move the artifacts out
mkdir -p ${ARTIFACT_DIR}/rpm mkdir -p ${ARTIFACT_DIR}/rpm