From 4fc2bd56eeb883fc5362a51a58db963e7a65695d Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Sat, 2 Nov 2019 01:24:26 -0400 Subject: [PATCH] Add master fallback for web build --- .copr/Makefile | 6 ++++-- deployment/fedora-package-x64/pkg-src/jellyfin.spec | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.copr/Makefile b/.copr/Makefile index 776a927f0..ba330ada9 100644 --- a/.copr/Makefile +++ b/.copr/Makefile @@ -3,7 +3,9 @@ VERSION := $(shell sed -ne '/^Version:/s/.* *//p' \ deployment/fedora-package-x64/pkg-src/jellyfin-web-$(VERSION).tar.gz: curl -f -L -o deployment/fedora-package-x64/pkg-src/jellyfin-web-$(VERSION).tar.gz \ - https://github.com/jellyfin/jellyfin-web/archive/v$(VERSION).tar.gz + https://github.com/jellyfin/jellyfin-web/archive/v$(VERSION).tar.gz \ + || curl -f -L -o deployment/fedora-package-x64/pkg-src/jellyfin-web-$(VERSION).tar.gz \ + https://github.com/jellyfin/jellyfin-web/archive/master.tar.gz \ srpm: deployment/fedora-package-x64/pkg-src/jellyfin-web-$(VERSION).tar.gz cd deployment/fedora-package-x64; \ @@ -54,4 +56,4 @@ srpm: deployment/fedora-package-x64/pkg-src/jellyfin-web-$(VERSION).tar.gz fi; \ rpmbuild -bs pkg-src/jellyfin.spec \ --define "_sourcedir $$PWD/pkg-src/" \ - --define "_srcrpmdir $(outdir)" \ No newline at end of file + --define "_srcrpmdir $(outdir)" diff --git a/deployment/fedora-package-x64/pkg-src/jellyfin.spec b/deployment/fedora-package-x64/pkg-src/jellyfin.spec index e4aa3923c..99e5e4418 100644 --- a/deployment/fedora-package-x64/pkg-src/jellyfin.spec +++ b/deployment/fedora-package-x64/pkg-src/jellyfin.spec @@ -53,7 +53,7 @@ Jellyfin is a free software media system that puts you in control of managing an %autosetup -n %{name}-%{version} -b 0 -b 1 web_build_dir="$(mktemp -d)" web_target="$PWD/MediaBrowser.WebDashboard/jellyfin-web" -pushd ../jellyfin-web-%{version} +pushd ../jellyfin-web-%{version} || pushd ../jellyfin-web-master %if 0%{?fedora} nodejs-yarn install %else