commit 5484f8562e1389ab853f67e7450dcec0a7fa7b80 Author: Michael Cronenworth <mike(a)cchtml.com&gt; Date: Mon Nov 18 21:50:51 2024 -0600 Update to 10.10.2 jellyfin-offline.sh | 4 +++- jellyfin-web-package-lock.json | 30 +++++++++++++++--------------- jellyfin.spec | 11 ++++++++++- sources | 8 ++++---- 4 files changed, 32 insertions(+), 21 deletions(-) --- diff --git a/jellyfin-offline.sh b/jellyfin-offline.sh index b9cf3cf..5d08b44 100755 --- a/jellyfin-offline.sh +++ b/jellyfin-offline.sh @@ -1,9 +1,11 @@ #!/bin/sh -JELLYFIN_VERSION=10.10.1 +JELLYFIN_VERSION=10.10.2 # Retrieve neccessary .NET NuGet packages for offline building tar xf jellyfin-${JELLYFIN_VERSION}.tar.gz +# https://github.com/jellyfin/jellyfin/pull/13063 +sed -i 's/8.0.404/8.0.0/' jellyfin-${JELLYFIN_VERSION}/global.json pushd jellyfin-${JELLYFIN_VERSION} mkdir jellyfin-nupkgs dotnet restore --packages ./jellyfin-nupkgs diff --git a/jellyfin-web-package-lock.json b/jellyfin-web-package-lock.json index 88abd59..bfa3c0e 100644 --- a/jellyfin-web-package-lock.json +++ b/jellyfin-web-package-lock.json @@ -1,12 +1,12 @@ { "name": "jellyfin-web", - "version": "10.10.1", + "version": "10.10.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "jellyfin-web", - "version": "10.10.1", + "version": "10.10.2", "license": "GPL-2.0-or-later", "dependencies": { "@emotion/react": "11.13.3", @@ -45,7 +45,7 @@ "jquery": "3.7.1", "jstree": "3.3.17", "libarchive.js": "2.0.2", - "libpgs": "0.6.0", + "libpgs": "0.8.1", "lodash-es": "4.17.21", "markdown-it": "14.1.0", "material-design-icons-iconfont": "6.7.0", @@ -8606,9 +8606,9 @@ "dev": true }, "node_modules/caniuse-lite": { - "version": "1.0.30001677", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001677.tgz", - "integrity": "sha512-fmfjsOlJUpMWu+mAAtZZZHz7UEwsUxIIvu1TJfO1HqFQvB/B+ii0xr9B5HpbZY/mC4XZ8SvjHJqtAY6pDPQEog==", + "version": "1.0.30001680", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz", + "integrity": "sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==", "dev": true, "funding": [ { @@ -15080,9 +15080,9 @@ } }, "node_modules/libpgs": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/libpgs/-/libpgs-0.6.0.tgz", - "integrity": "sha512-k8ic6VTJTCun8Ump8iAe+tZi3pa1ZhDlq1v4hmZOmYQzSQ44QpZoClMXuSfJ1B91eRWOO6q50rXhyCPuB9dXbg==", + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/libpgs/-/libpgs-0.8.1.tgz", + "integrity": "sha512-Z8WCvHRYr37QjU8b2WqiJpCvnoojbYPtoE4FktwdI+m+b1QkNIKqrYQrlPKG1xvYyQWgV1j+16xjFOhun4nBUA==", "license": "MIT" }, "node_modules/lie": { @@ -31685,9 +31685,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001677", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001677.tgz", - "integrity": "sha512-fmfjsOlJUpMWu+mAAtZZZHz7UEwsUxIIvu1TJfO1HqFQvB/B+ii0xr9B5HpbZY/mC4XZ8SvjHJqtAY6pDPQEog==", + "version": "1.0.30001680", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz", + "integrity": "sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==", "dev": true }, "canvas": { @@ -36347,9 +36347,9 @@ } }, "libpgs": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/libpgs/-/libpgs-0.6.0.tgz", - "integrity": "sha512-k8ic6VTJTCun8Ump8iAe+tZi3pa1ZhDlq1v4hmZOmYQzSQ44QpZoClMXuSfJ1B91eRWOO6q50rXhyCPuB9dXbg==" + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/libpgs/-/libpgs-0.8.1.tgz", + "integrity": "sha512-Z8WCvHRYr37QjU8b2WqiJpCvnoojbYPtoE4FktwdI+m+b1QkNIKqrYQrlPKG1xvYyQWgV1j+16xjFOhun4nBUA==" }, "lie": { "version": "3.1.1", diff --git a/jellyfin.spec b/jellyfin.spec index 15fa248..5d03d82 100644 --- a/jellyfin.spec +++ b/jellyfin.spec @@ -11,7 +11,7 @@ %endif Name: jellyfin -Version: 10.10.1 +Version: 10.10.2 Release: 1%{?dist} Summary: The Free Software Media System License: GPL-2.0-only @@ -34,6 +34,9 @@ Source15: %{name}-firewalld.xml Source16: %{name}-server-lowports.conf Source17: %{name}.sysusers +# https://github.com/jellyfin/jellyfin/pull/13059 +Patch0: %{name}-10.10.2-playlist-migration.patch + # dotnet does not offer a runtime on ppc ExcludeArch: %{power64} ppc64le %{arm} @@ -117,6 +120,9 @@ tar xf %{SOURCE4} cp -p %{SOURCE5} %{name}-web-%{version}/package-lock.json popd +# https://github.com/jellyfin/jellyfin/pull/13063 +sed -i 's/8.0.404/8.0.0/' global.json + dotnet nuget add source %{_builddir}/jellyfin-nupkgs -n jellyfin-nupkgs dotnet nuget add source %{_builddir}/jellyfin-nupkgs-system -n jellyfin-nupkgs-system dotnet nuget disable source nuget @@ -301,6 +307,9 @@ fi %changelog +* Mon Nov 18 2024 Michael Cronenworth <mike(a)cchtml.com&gt; - 10.10.2-1 +- Update to 10.10.2 + * Sun Nov 03 2024 Michael Cronenworth <mike(a)cchtml.com&gt; - 10.10.1-1 - Update to 10.10.1 diff --git a/sources b/sources index f207b41..26051f2 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -SHA512 (jellyfin-10.10.1.tar.gz) = 48772ee5f769afe4fd1831344bd95d13728d9a54ddd3df939efb656f5c0e7be6557d2fbd1ca4ecd6bdc727ab1322e63f966cb73cd50ac8c02b43478f2413bef3 -SHA512 (jellyfin-web-10.10.1.tar.gz) = 8f9bbe4ea4d9c872825057698b4613476ee6ada81a03db8f51a6343e5e37770cab606297213b76d2326d7c1e3e3a84db4e2a3bcfbe3aa7b08b5f8fd53f257f50 -SHA512 (jellyfin-npm.tar.xz) = f123a83b9957e83816d486585c53a6d4b89db3ce3c02456963bea1067d387f2a8188aa4ac9171531895eed5abb85c277ea3a8cb50700b836f385b9a30c7190cd -SHA512 (jellyfin-nupkgs.tar.xz) = e1a7919938c5c680973b7ae85db21adca07189144d2c95d16d811aecbab49d3c6192f5e09940828ea802454ce222e1c9fc114dbdbb61149ca5c7a0df359bbe93 +SHA512 (jellyfin-10.10.2.tar.gz) = da709cdb04ba5b0517ee69965e33034b33d05914be66b720642befd5239c9d8c9652e1a536bf6d7c96e2fba5c6fbefbe671d99239fa2634b0bb112b10df6e96c +SHA512 (jellyfin-web-10.10.2.tar.gz) = 305b4a14d3ca1d0612beb11feb7eff1308a72613f04b40a92f8fb586c642bfb6c5d3c31bdbaf7d1421c83293299db204fea1c106c8be99b1ebf7eb3ae5fea050 +SHA512 (jellyfin-npm.tar.xz) = bc13cc4bf80483261a9a77bd732c96799c50ee9d2b3f407457b4eaa0fb521e638800fc84e858bf1b2eb826abe78158484bbbb4d4c2ceb3c91a679761f071df35 +SHA512 (jellyfin-nupkgs.tar.xz) = c9a7604174ceb59576a930a70786f69a9105e03ce229a5718fc03d3ea7a2d7d008809344554d2c5298a9da459216d0d507455b9b40a1b1a81b033ec2782e381a SHA512 (jellyfin-nupkgs-system.tar.xz) = b394274d5518ecfc34b2357710852e07a4e9087d416cd460b3ba2bad45f49c06b9a9d6cbaef9ad3e70c5e4dd829dd30fd033ab55403cdaa8f9205c21cc2886a7