milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix fedora build version

Browse source
This commit is contained in:
Bill Thornton 2021-12-29 11:48:15 -05:00
parent f88fb7045a
commit 215a27b202
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fedora/Makefile
View file

@ -4,9 +4,8 @@ $(info $(shell set -x; if [ "$$(id -u)" = "0" ]; then echo "Installing git"; dnf
NAME := jellyfin-web NAME := jellyfin-web
VERSION := $(shell set -x; sed -ne '/^Version:/s/.* *//p' $(DIR)/$(NAME).spec) 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) 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 -,~,$(VERSION))-$(RELEASE)$(shell rpm --eval %dist).src.rpm
SRPM := jellyfin-web-$(subst -,~,$(GIT_VER))-$(RELEASE)$(shell rpm --eval %dist).src.rpm TARBALL :=$(NAME)-$(subst -,~,$(VERSION)).tar.gz
TARBALL :=$(NAME)-$(subst -,~,$(GIT_VER)).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/
@ -20,9 +19,9 @@ $(DIR)/$(TARBALL):
cd $(DIR)/; \ cd $(DIR)/; \
SOURCE_DIR=.. \ SOURCE_DIR=.. \
WORKDIR="$${PWD}"; \ WORKDIR="$${PWD}"; \
version=$(GIT_VER); \ version=$(VERSION); \
tar \ tar \
--transform "s,^\.,$(NAME)-$(subst -,~,$(GIT_VER))," \ --transform "s,^\.,$(NAME)-$(subst -,~,$(VERSION))," \
--exclude='.git*' \ --exclude='.git*' \
--exclude='**/.git' \ --exclude='**/.git' \
--exclude='**/.hg' \ --exclude='**/.hg' \
@ -34,7 +33,6 @@ $(DIR)/$(TARBALL):
-C $${SOURCE_DIR} ./ -C $${SOURCE_DIR} ./
$(DIR)/$(SRPM): $(DIR)/$(TARBALL) $(DIR)/jellyfin-web.spec $(DIR)/$(SRPM): $(DIR)/$(TARBALL) $(DIR)/jellyfin-web.spec
./bump_version $(GIT_VER)
cd $(DIR)/; \ cd $(DIR)/; \
rpmbuild -bs $(NAME).spec \ rpmbuild -bs $(NAME).spec \
--define "_sourcedir $$PWD/" \ --define "_sourcedir $$PWD/" \