diff --git a/fedora/Makefile b/fedora/Makefile index ce770e0ecc8..344c10b6267 100644 --- a/fedora/Makefile +++ b/fedora/Makefile @@ -4,9 +4,8 @@ $(info $(shell set -x; if [ "$$(id -u)" = "0" ]; then echo "Installing git"; dnf NAME := jellyfin-web VERSION := $(shell set -x; sed -ne '/^Version:/s/.* *//p' $(DIR)/$(NAME).spec) RELEASE := $(shell set -x; sed -ne '/^Release:/s/.* *\(.*\)%{.*}.*/\1/p' $(DIR)/$(NAME).spec) -GIT_VER := $(shell set -x; git describe --tags | sed -e 's/^v//' -e 's/-[0-9]*-g.*$$//') -SRPM := jellyfin-web-$(subst -,~,$(GIT_VER))-$(RELEASE)$(shell rpm --eval %dist).src.rpm -TARBALL :=$(NAME)-$(subst -,~,$(GIT_VER)).tar.gz +SRPM := jellyfin-web-$(subst -,~,$(VERSION))-$(RELEASE)$(shell rpm --eval %dist).src.rpm +TARBALL :=$(NAME)-$(subst -,~,$(VERSION)).tar.gz epel-7-x86_64_repos := https://rpm.nodesource.com/pub_16.x/el/\$$releasever/\$$basearch/ @@ -20,9 +19,9 @@ $(DIR)/$(TARBALL): cd $(DIR)/; \ SOURCE_DIR=.. \ WORKDIR="$${PWD}"; \ - version=$(GIT_VER); \ + version=$(VERSION); \ tar \ - --transform "s,^\.,$(NAME)-$(subst -,~,$(GIT_VER))," \ + --transform "s,^\.,$(NAME)-$(subst -,~,$(VERSION))," \ --exclude='.git*' \ --exclude='**/.git' \ --exclude='**/.hg' \ @@ -34,7 +33,6 @@ $(DIR)/$(TARBALL): -C $${SOURCE_DIR} ./ $(DIR)/$(SRPM): $(DIR)/$(TARBALL) $(DIR)/jellyfin-web.spec - ./bump_version $(GIT_VER) cd $(DIR)/; \ rpmbuild -bs $(NAME).spec \ --define "_sourcedir $$PWD/" \ diff --git a/fedora/jellyfin-web.spec b/fedora/jellyfin-web.spec index d8195fb3feb..3a4e0aeace6 100644 --- a/fedora/jellyfin-web.spec +++ b/fedora/jellyfin-web.spec @@ -30,6 +30,10 @@ Jellyfin is a free software media system that puts you in control of managing an %build %install +%if 0%{?rhel} > 0 && 0%{?rhel} < 8 +# Required for CentOS build +chown root:root -R . +%endif npm ci --no-audit --unsafe-perm %{__mkdir} -p %{buildroot}%{_datadir} mv dist %{buildroot}%{_datadir}/jellyfin-web