diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2021-12-31 03:47:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-31 03:47:06 -0500 |
| commit | dc9e1ece2929dbe64a5af6e10a0594f5b3e9bb5c (patch) | |
| tree | 1dcea631e3dcd6c1ed79835d1a80920eb3a297a9 | |
| parent | 53447976f0970e88d283642c4419334f94b9864e (diff) | |
| parent | 226a43619f6427c6f816f48b495e31eca3a58a46 (diff) | |
Merge pull request #7070 from thornbill/fix-ci-builds
| -rw-r--r-- | fedora/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fedora/Makefile b/fedora/Makefile index 22cc30448..261fd262d 100644 --- a/fedora/Makefile +++ b/fedora/Makefile @@ -3,9 +3,8 @@ INSTGIT := $(shell if [ "$$(id -u)" = "0" ]; then dnf -y install git; fi) NAME := jellyfin-server VERSION := $(shell sed -ne '/^Version:/s/.* *//p' $(DIR)/jellyfin.spec) RELEASE := $(shell sed -ne '/^Release:/s/.* *\(.*\)%{.*}.*/\1/p' $(DIR)/jellyfin.spec) -GIT_VER := $(shell git describe --tags | sed -e 's/^v//' -e 's/-[0-9]*-g.*$$//') -SRPM := jellyfin-$(subst -,~,$(GIT_VER))-$(RELEASE)$(shell rpm --eval %dist).src.rpm -TARBALL :=$(NAME)-$(subst -,~,$(GIT_VER)).tar.gz +SRPM := jellyfin-$(subst -,~,$(VERSION))-$(RELEASE)$(shell rpm --eval %dist).src.rpm +TARBALL :=$(NAME)-$(subst -,~,$(VERSION)).tar.gz epel-7-x86_64_repos := https://packages.microsoft.com/rhel/7/prod/ epel-8-x86_64_repos := https://download.copr.fedorainfracloud.org/results/@dotnet-sig/dotnet-preview/$(TARGET)/ @@ -24,9 +23,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' \ @@ -43,7 +42,6 @@ $(DIR)/$(TARBALL): -C $${SOURCE_DIR} ./ $(DIR)/$(SRPM): $(DIR)/$(TARBALL) $(DIR)/jellyfin.spec - ./bump_version $(GIT_VER) cd $(DIR)/; \ rpmbuild -bs jellyfin.spec \ --define "_sourcedir $$PWD/" \ |