Merge pull request #7000 from brianjmurrell/update-build-for-el7

Fix build on EL7

4 files changed, 50 insertions, 35 deletions

diff --git a/.copr b/.copr
new file mode 120000
index 000000000..100fe0cd7
--- /dev/null
+++ b/.copr
@@ -0,0 +1 @@
+fedora
\ No newline at end of file
diff --git a/.copr/Makefile b/.copr/Makefile
deleted file mode 120000
index ec3c90dfd..000000000
--- a/.copr/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../fedora/Makefile
\ No newline at end of file
diff --git a/fedora/Makefile b/fedora/Makefile
index 6b09458b5..22cc30448 100644
--- a/fedora/Makefile
+++ b/fedora/Makefile
@@ -1,41 +1,55 @@
-VERSION := $(shell sed -ne '/^Version:/s/.*  *//p' fedora/jellyfin.spec)
-outdir  ?= fedora/
+DIR     := $(dir $(lastword $(MAKEFILE_LIST)))
+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
+
+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)/
+fedora_repos        := https://download.copr.fedorainfracloud.org/results/@dotnet-sig/dotnet-preview/$(TARGET)/
+fedora-34-x86_64_repos := $(fedora_repos)
+fedora-35-x86_64_repos := $(fedora_repos)
+fedora-34-x86_64_repos := $(fedora_repos)
+
+outdir  ?= $(PWD)/$(DIR)/
 TARGET  ?= fedora-35-x86_64
 
-srpm:
-	pushd fedora/;                                              \
-	if [ "$$(id -u)" = "0" ]; then                              \
-	    dnf -y install git;                                     \
-	fi;                                                         \
-	version=$$(git describe --tags | sed -e 's/^v//'            \
-	                                     -e 's/-[0-9]*-g.*$$//' \
-	                                     -e 's/-/~/');          \
-	SOURCE_DIR=..                                               \
-	WORKDIR="$${PWD}";                                          \
-	tar                                                         \
-	--transform "s,^\.,jellyfin-server-$$version,"              \
-	--exclude='.git*'                                           \
-	--exclude='**/.git'                                         \
-	--exclude='**/.hg'                                          \
-	--exclude='**/.vs'                                          \
-	--exclude='**/.vscode'                                      \
-	--exclude=deployment                                        \
-	--exclude='**/bin'                                          \
-	--exclude='**/obj'                                          \
-	--exclude='**/.nuget'                                       \
-	--exclude='*.deb'                                           \
-	--exclude='*.rpm'                                           \
-	--exclude=jellyfin-server-$$version.tar.gz                  \
-	-czf "jellyfin-server-$$version.tar.gz"                     \
-	-C $${SOURCE_DIR} ./;                                       \
-	popd;                                                       \
-	./bump_version $$version
-	cd fedora/;                              \
+srpm: $(DIR)/$(SRPM)
+tarball: $(DIR)/$(TARBALL)
+
+$(DIR)/$(TARBALL):
+	cd $(DIR)/;                                          \
+	SOURCE_DIR=..                                        \
+	WORKDIR="$${PWD}";                                   \
+	version=$(GIT_VER);                                  \
+	tar                                                  \
+	--transform "s,^\.,$(NAME)-$(subst -,~,$(GIT_VER))," \
+	--exclude='.git*'                                    \
+	--exclude='**/.git'                                  \
+	--exclude='**/.hg'                                   \
+	--exclude='**/.vs'                                   \
+	--exclude='**/.vscode'                               \
+	--exclude=deployment                                 \
+	--exclude='**/bin'                                   \
+	--exclude='**/obj'                                   \
+	--exclude='**/.nuget'                                \
+	--exclude='*.deb'                                    \
+	--exclude='*.rpm'                                    \
+	--exclude=$(notdir $@)                               \
+	-czf $(notdir $@)                                    \
+	-C $${SOURCE_DIR} ./
+
+$(DIR)/$(SRPM): $(DIR)/$(TARBALL) $(DIR)/jellyfin.spec
+	./bump_version $(GIT_VER)
+	cd $(DIR)/;                              \
 	rpmbuild -bs jellyfin.spec               \
 	         --define "_sourcedir $$PWD/"    \
 	         --define "_srcrpmdir $(outdir)"
 
-rpms: fedora/jellyfin-$(shell git describe --tags | sed -e 's/^v//' -e 's/-[0-9]*-g.*$$//' -e 's/-/~/')-1$(shell rpm --eval %dist).src.rpm
-	mock --addrepo=https://download.copr.fedorainfracloud.org/results/@dotnet-sig/dotnet-preview/$(TARGET)/ \
-	     --enable-network                                                                                   \
+rpms: $(DIR)/$(SRPM)
+	mock $(addprefix --addrepo=, $($(TARGET)_repos)) \
+	     --enable-network                            \
 	     -r $(TARGET) $<
diff --git a/fedora/jellyfin.spec b/fedora/jellyfin.spec
index a4584364e..e93944a20 100644
--- a/fedora/jellyfin.spec
+++ b/fedora/jellyfin.spec
@@ -64,6 +64,7 @@ the Jellyfin server to bind to ports 80 and/or 443 for example.
 %install
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+export PATH=$PATH:/usr/local/bin
 dotnet publish --configuration Release --output='%{buildroot}%{_libdir}/jellyfin' --self-contained --runtime %{dotnet_runtime} \
     "-p:DebugSymbols=false;DebugType=none" Jellyfin.Server
 %{__install} -D -m 0644 LICENSE %{buildroot}%{_datadir}/licenses/jellyfin/LICENSE