From e33706ab251e830b6b8d8bb4ecade81a410a6542 Mon Sep 17 00:00:00 2001
From: "Brian J. Murrell" <brian@interlinx.bc.ca>
Date: Fri, 15 Feb 2019 08:50:31 -0500
Subject: [PATCH] Code review updates

Also fix a bug in the tarball creation that existed even prior
to moving it into create_tarball.sh
---
 .copr/Makefile                                      | 3 +--
 deployment/fedora-package-x64/create_tarball.sh     | 8 ++++----
 deployment/fedora-package-x64/pkg-src/jellyfin.spec | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.copr/Makefile b/.copr/Makefile
index dbc7e4ad9d..84b98a0116 100644
--- a/.copr/Makefile
+++ b/.copr/Makefile
@@ -1,7 +1,6 @@
 srpm:
 	dnf -y install git
-	git submodule init
-	git submodule update
+	git submodule update --init --recursive
 	cd deployment/fedora-package-x64;                    \
 	./create_tarball.sh;                                 \
 	rpmbuild -bs pkg-src/jellyfin.spec                   \
diff --git a/deployment/fedora-package-x64/create_tarball.sh b/deployment/fedora-package-x64/create_tarball.sh
index 89a3a94752..e8301c9897 100755
--- a/deployment/fedora-package-x64/create_tarball.sh
+++ b/deployment/fedora-package-x64/create_tarball.sh
@@ -24,12 +24,12 @@ tar \
 --exclude='**/.nuget' \
 --exclude='*.deb' \
 --exclude='*.rpm' \
--Jcf "$pkg_src_dir/jellyfin-${VERSION}.tar.xz" \
+-czf "$pkg_src_dir/jellyfin-${VERSION}.tar.gz" \
 -C "../.." ./ || GNU_TAR=0
 
 if [ $GNU_TAR -eq 0 ]; then
     echo "The installed tar binary did not support --transform. Using workaround."
-    mkdir -p "${package_temporary_dir}/jellyfin"
+    mkdir -p "${package_temporary_dir}/jellyfin"{,-"${VERSION}"}
     # Not GNU tar
     tar \
     --exclude='.git*' \
@@ -47,9 +47,9 @@ if [ $GNU_TAR -eq 0 ]; then
     "${package_temporary_dir}/jellyfin/jellyfin-${VERSION}.tar.gz" \
     -C "../.." ./
     echo "Extracting filtered package."
-    tar -Jzf "${package_temporary_dir}/jellyfin/jellyfin-${VERSION}.tar.gz" -C "${package_temporary_dir}/jellyfin-${VERSION}"
+    tar -xzf "${package_temporary_dir}/jellyfin/jellyfin-${VERSION}.tar.gz" -C "${package_temporary_dir}/jellyfin-${VERSION}"
     echo "Removing filtered package."
     rm -f "${package_temporary_dir}/jellyfin/jellyfin-${VERSION}.tar.gz"
     echo "Repackaging package into final tarball."
-    tar -Jzf "${pkg_src_dir}/jellyfin-${VERSION}.tar.gz" -C "${package_temporary_dir}" "jellyfin-${VERSION}"
+    tar -czf "${pkg_src_dir}/jellyfin-${VERSION}.tar.gz" -C "${package_temporary_dir}" "jellyfin-${VERSION}"
 fi
diff --git a/deployment/fedora-package-x64/pkg-src/jellyfin.spec b/deployment/fedora-package-x64/pkg-src/jellyfin.spec
index 262b9203aa..851c400445 100644
--- a/deployment/fedora-package-x64/pkg-src/jellyfin.spec
+++ b/deployment/fedora-package-x64/pkg-src/jellyfin.spec
@@ -12,7 +12,7 @@ Release:        1%{?dist}
 Summary:        The Free Software Media Browser
 License:        GPLv2
 URL:            https://jellyfin.media
-Source0:        %{name}-%{version}.tar.xz
+Source0:        %{name}-%{version}.tar.gz
 Source1:        jellyfin.service
 Source2:        jellyfin.env
 Source3:        jellyfin.sudoers