lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code review updates

Browse Source 
Also fix a bug in the tarball creation that existed even prior
to moving it into create_tarball.sh
This commit is contained in:
Brian J. Murrell 2019-02-15 08:50:31 -05:00
parent 4018b7e2d5
commit e33706ab25
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.copr/Makefile
View File

@ -1,7 +1,6 @@
srpm: srpm:
dnf -y install git dnf -y install git
git submodule init git submodule update --init --recursive
git submodule update
cd deployment/fedora-package-x64; \ cd deployment/fedora-package-x64; \
./create_tarball.sh; \ ./create_tarball.sh; \
rpmbuild -bs pkg-src/jellyfin.spec \ rpmbuild -bs pkg-src/jellyfin.spec \

8
deployment/fedora-package-x64/create_tarball.sh
View File

@ -24,12 +24,12 @@ tar \
--exclude='**/.nuget' \ --exclude='**/.nuget' \
--exclude='*.deb' \ --exclude='*.deb' \
--exclude='*.rpm' \ --exclude='*.rpm' \
-Jcf "$pkg_src_dir/jellyfin-${VERSION}.tar.xz" \ -czf "$pkg_src_dir/jellyfin-${VERSION}.tar.gz" \
-C "../.." ./ || GNU_TAR=0 -C "../.." ./ || GNU_TAR=0
if [ $GNU_TAR -eq 0 ]; then if [ $GNU_TAR -eq 0 ]; then
echo "The installed tar binary did not support --transform. Using workaround." 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 # Not GNU tar
tar \ tar \
--exclude='.git*' \ --exclude='.git*' \
@ -47,9 +47,9 @@ if [ $GNU_TAR -eq 0 ]; then
"${package_temporary_dir}/jellyfin/jellyfin-${VERSION}.tar.gz" \ "${package_temporary_dir}/jellyfin/jellyfin-${VERSION}.tar.gz" \
-C "../.." ./ -C "../.." ./
echo "Extracting filtered package." 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." echo "Removing filtered package."
rm -f "${package_temporary_dir}/jellyfin/jellyfin-${VERSION}.tar.gz" rm -f "${package_temporary_dir}/jellyfin/jellyfin-${VERSION}.tar.gz"
echo "Repackaging package into final tarball." 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 fi

2
deployment/fedora-package-x64/pkg-src/jellyfin.spec
View File

@ -12,7 +12,7 @@ Release: 1%{?dist}
Summary: The Free Software Media Browser Summary: The Free Software Media Browser
License: GPLv2 License: GPLv2
URL: https://jellyfin.media URL: https://jellyfin.media
Source0: %{name}-%{version}.tar.xz Source0: %{name}-%{version}.tar.gz
Source1: jellyfin.service Source1: jellyfin.service
Source2: jellyfin.env Source2: jellyfin.env
Source3: jellyfin.sudoers Source3: jellyfin.sudoers