Add master fallback for web build

This commit is contained in:
Joshua Boniface 2019-11-02 01:24:26 -04:00
parent e40c82be88
commit 4fc2bd56ee
2 changed files with 5 additions and 3 deletions

View File

@ -3,7 +3,9 @@ VERSION := $(shell sed -ne '/^Version:/s/.* *//p' \
deployment/fedora-package-x64/pkg-src/jellyfin-web-$(VERSION).tar.gz: 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 \ 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 srpm: deployment/fedora-package-x64/pkg-src/jellyfin-web-$(VERSION).tar.gz
cd deployment/fedora-package-x64; \ cd deployment/fedora-package-x64; \
@ -54,4 +56,4 @@ srpm: deployment/fedora-package-x64/pkg-src/jellyfin-web-$(VERSION).tar.gz
fi; \ fi; \
rpmbuild -bs pkg-src/jellyfin.spec \ rpmbuild -bs pkg-src/jellyfin.spec \
--define "_sourcedir $$PWD/pkg-src/" \ --define "_sourcedir $$PWD/pkg-src/" \
--define "_srcrpmdir $(outdir)" --define "_srcrpmdir $(outdir)"

View File

@ -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 %autosetup -n %{name}-%{version} -b 0 -b 1
web_build_dir="$(mktemp -d)" web_build_dir="$(mktemp -d)"
web_target="$PWD/MediaBrowser.WebDashboard/jellyfin-web" web_target="$PWD/MediaBrowser.WebDashboard/jellyfin-web"
pushd ../jellyfin-web-%{version} pushd ../jellyfin-web-%{version} || pushd ../jellyfin-web-master
%if 0%{?fedora} %if 0%{?fedora}
nodejs-yarn install nodejs-yarn install
%else %else