cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-15 09:58:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3571 from mihawk90/fedora-spec-rework

Browse Source 
Cleanup and standardise Fedora build (web)

(cherry picked from commit c20243c8bf)
Signed-off-by: Bill Thornton <billt2006@gmail.com>
This commit is contained in:
Cody Robibero 2022-06-23 08:06:21 -06:00 committed by Bill Thornton
parent fa84f0aef5
commit c2229c409f
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/Dockerfile.fedora
View File

@ -1,4 +1,4 @@
FROM fedora:33 FROM fedora:36
# Docker build arguments # Docker build arguments
ARG SOURCE_DIR=/jellyfin ARG SOURCE_DIR=/jellyfin
@ -11,7 +11,7 @@ ENV IS_DOCKER=YES
# Prepare Fedora environment # Prepare Fedora environment
RUN dnf update -y \ RUN dnf update -y \
&& dnf install -y @buildsys-build rpmdevtools git dnf-plugins-core nodejs autoconf automake glibc-devel && dnf install -y @buildsys-build rpmdevtools git dnf-plugins-core nodejs autoconf automake glibc-devel make
# Link to build script # Link to build script
RUN ln -sf ${SOURCE_DIR}/deployment/build.fedora /build.sh RUN ln -sf ${SOURCE_DIR}/deployment/build.fedora /build.sh

6
fedora/Makefile
View File

@ -9,8 +9,12 @@ TARBALL :=$(NAME)-$(subst -,~,$(VERSION)).tar.gz
epel-7-x86_64_repos := https://rpm.nodesource.com/pub_16.x/el/\$$releasever/\$$basearch/ epel-7-x86_64_repos := https://rpm.nodesource.com/pub_16.x/el/\$$releasever/\$$basearch/
fed_ver := $(shell rpm -E %fedora)
# fallback when not running on Fedora
fed_ver ?= 36
TARGET ?= fedora-$(fed_ver)-x86_64
outdir ?= $(PWD)/$(DIR)/ outdir ?= $(PWD)/$(DIR)/
TARGET ?= fedora-35-x86_64
srpm: $(DIR)/$(SRPM) srpm: $(DIR)/$(SRPM)
tarball: $(DIR)/$(TARBALL) tarball: $(DIR)/$(TARBALL)

25
fedora/jellyfin-web.spec
View File

@ -4,7 +4,7 @@ Name: jellyfin-web
Version: 10.8.0 Version: 10.8.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: The Free Software Media System web client Summary: The Free Software Media System web client
License: GPLv3 License: GPLv2
URL: https://jellyfin.org URL: https://jellyfin.org
# Jellyfin Server tarball created by `make -f .copr/Makefile srpm`, real URL ends with `v%%{version}.tar.gz` # Jellyfin Server tarball created by `make -f .copr/Makefile srpm`, real URL ends with `v%%{version}.tar.gz`
Source0: jellyfin-web-%{version}.tar.gz Source0: jellyfin-web-%{version}.tar.gz
@ -17,9 +17,6 @@ BuildRequires: git
BuildRequires: npm BuildRequires: npm
%endif %endif
# Disable Automatic Dependency Processing
AutoReqProv: no
%description %description
Jellyfin is a free software media system that puts you in control of managing and streaming your media. Jellyfin is a free software media system that puts you in control of managing and streaming your media.
@ -27,22 +24,26 @@ Jellyfin is a free software media system that puts you in control of managing an
%prep %prep
%autosetup -n jellyfin-web-%{version} -b 0 %autosetup -n jellyfin-web-%{version} -b 0
%build
%install
%if 0%{?rhel} > 0 && 0%{?rhel} < 8 %if 0%{?rhel} > 0 && 0%{?rhel} < 8
# Required for CentOS build # Required for CentOS build
chown root:root -R . chown root:root -R .
%endif %endif
%build
npm ci --no-audit --unsafe-perm npm ci --no-audit --unsafe-perm
%{__mkdir} -p %{buildroot}%{_datadir}
mv dist %{buildroot}%{_datadir}/jellyfin-web
%{__install} -D -m 0644 LICENSE %{buildroot}%{_datadir}/licenses/jellyfin/LICENSE %install
%{__mkdir} -p %{buildroot}%{_libdir}/jellyfin/jellyfin-web
%{__cp} -r dist/* %{buildroot}%{_libdir}/jellyfin/jellyfin-web
%files %files
%defattr(644,root,root,755) %defattr(644,root,root,755)
%{_datadir}/jellyfin-web %{_libdir}/jellyfin/jellyfin-web
%{_datadir}/licenses/jellyfin/LICENSE %license LICENSE
%changelog %changelog
* Fri Dec 04 2020 Jellyfin Packaging Team <packaging@jellyfin.org> * Fri Dec 04 2020 Jellyfin Packaging Team <packaging@jellyfin.org>