michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2607 from joshuaboniface/fix-fedora

Browse Source 
Correct BuildRequires and NodeJS for Fedora/CentOS
This commit is contained in:
Joshua M. Boniface 2020-03-15 23:03:06 -04:00 committed by GitHub
commit ef4dfd4461
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ RUN yum install -y @buildsys-build rpmdevtools yum-plugins-core libcurl-devel fo
# Install recent NodeJS and Yarn # Install recent NodeJS and Yarn
RUN curl -fSsLo /etc/yum.repos.d/yarn.repo https://dl.yarnpkg.com/rpm/yarn.repo \ RUN curl -fSsLo /etc/yum.repos.d/yarn.repo https://dl.yarnpkg.com/rpm/yarn.repo \
&& rpm -i https://rpm.nodesource.com/pub_8.x/el/7/x86_64/nodesource-release-el7-1.noarch.rpm \ && rpm -i https://rpm.nodesource.com/pub_10.x/el/7/x86_64/nodesource-release-el7-1.noarch.rpm \
&& yum install -y yarn && yum install -y yarn
# Install DotNET SDK # Install DotNET SDK

8
deployment/fedora-package-x64/pkg-src/jellyfin.spec
View File

@ -26,13 +26,13 @@ Source16: jellyfin-firewalld.xml
%{?systemd_requires} %{?systemd_requires}
BuildRequires: systemd BuildRequires: systemd
Requires(pre): shadow-utils Requires(pre): shadow-utils
BuildRequires: libcurl-devel, fontconfig-devel, freetype-devel, openssl-devel, glibc-devel, libicu-devel BuildRequires: libcurl-devel, fontconfig-devel, freetype-devel, openssl-devel, glibc-devel, libicu-devel, git
%if 0%{?fedora} %if 0%{?fedora}
BuildRequires: nodejs-yarn BuildRequires: nodejs-yarn, git
%else %else
# Requirements not packaged in main repos # Requirements not packaged in main repos
# From https://rpm.nodesource.com/pub_8.x/el/7/x86_64/ # From https://rpm.nodesource.com/pub_10.x/el/7/x86_64/
BuildRequires: nodejs >= 8 yarn BuildRequires: nodejs >= 10 yarn
%endif %endif
Requires: libcurl, fontconfig, freetype, openssl, glibc libicu Requires: libcurl, fontconfig, freetype, openssl, glibc libicu
# Requirements not packaged in main repos # Requirements not packaged in main repos