From 925c2c926d11b6570e282b6b8a1ba154f581e1fa Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Wed, 10 Mar 2021 09:37:44 -0500 Subject: [PATCH 1/5] Add BR: nodejs for Fedora 33 and up nodejs doesn't seem to be implicitly installed as a BR: on Fedora 33, so set an explicit BR: for it. Signed-off-by: Brian J. Murrell --- fedora/jellyfin-web.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fedora/jellyfin-web.spec b/fedora/jellyfin-web.spec index 99e05c3fcf..e6349c1bdd 100644 --- a/fedora/jellyfin-web.spec +++ b/fedora/jellyfin-web.spec @@ -18,6 +18,9 @@ BuildRequires: nodejs-yarn # ditto for Fedora's yarn RPM BuildRequires: git BuildArch: noarch +%if 0%{?fedora} >= 33 +BuildRequires: nodejs +%endif # Disable Automatic Dependency Processing AutoReqProv: no From a6d9897d8f0ae3c13b5d15f6e6e4f0c78ddb5845 Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Wed, 10 Mar 2021 09:59:31 -0500 Subject: [PATCH 2/5] Escape macro in comment Not really allowed to use macros in comments and rpmbuild on F33 is starting to enforce this. Signed-off-by: Brian J. Murrell --- fedora/jellyfin-web.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora/jellyfin-web.spec b/fedora/jellyfin-web.spec index e6349c1bdd..d0c8d4ba23 100644 --- a/fedora/jellyfin-web.spec +++ b/fedora/jellyfin-web.spec @@ -6,7 +6,7 @@ Release: 1%{?dist} Summary: The Free Software Media System web client License: GPLv3 URL: https://jellyfin.org -# Jellyfin Server tarball created by `make -f .copr/Makefile srpm`, real URL ends with `v%{version}.tar.gz` +# Jellyfin Server tarball created by `make -f .copr/Makefile srpm`, real URL ends with `v%%{version}.tar.gz` Source0: jellyfin-web-%{version}.tar.gz %if 0%{?centos} From 31b52f2c32e89d15a0aa3106d5f5a4909f4aa4c4 Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Wed, 10 Mar 2021 10:25:29 -0500 Subject: [PATCH 3/5] Reduce permissions Giving everything a blanket execute permission is overzealous and dangerous. Change permissions to 644. Signed-off-by: Brian J. Murrell --- fedora/jellyfin-web.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora/jellyfin-web.spec b/fedora/jellyfin-web.spec index d0c8d4ba23..babbb7c4fc 100644 --- a/fedora/jellyfin-web.spec +++ b/fedora/jellyfin-web.spec @@ -41,7 +41,7 @@ mv dist %{buildroot}%{_datadir}/jellyfin-web %{__install} -D -m 0644 LICENSE %{buildroot}%{_datadir}/licenses/jellyfin/LICENSE %files -%attr(755,root,root) %{_datadir}/jellyfin-web +%attr(644,root,root) %{_datadir}/jellyfin-web %{_datadir}/licenses/jellyfin/LICENSE %changelog From e404106f9c63014eaf9197e41cd2b3f61a4cad36 Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Thu, 11 Mar 2021 08:33:38 -0500 Subject: [PATCH 4/5] Make directory permissions 755 Files can/should be 644 but directories need to be 755. Signed-off-by: Brian J. Murrell --- fedora/jellyfin-web.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fedora/jellyfin-web.spec b/fedora/jellyfin-web.spec index babbb7c4fc..5db5b0f028 100644 --- a/fedora/jellyfin-web.spec +++ b/fedora/jellyfin-web.spec @@ -41,7 +41,8 @@ mv dist %{buildroot}%{_datadir}/jellyfin-web %{__install} -D -m 0644 LICENSE %{buildroot}%{_datadir}/licenses/jellyfin/LICENSE %files -%attr(644,root,root) %{_datadir}/jellyfin-web +%defattr(644,root,root,755) +%{_datadir}/jellyfin-web %{_datadir}/licenses/jellyfin/LICENSE %changelog From bcba45fc7df270b37f0e294e0d76a2161fbcf0e9 Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Thu, 11 Mar 2021 08:46:53 -0500 Subject: [PATCH 5/5] Bump the Release: So that it successfully upgrades any broken ones. Signed-off-by: Brian J. Murrell --- fedora/jellyfin-web.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora/jellyfin-web.spec b/fedora/jellyfin-web.spec index 5db5b0f028..cc53cd0fad 100644 --- a/fedora/jellyfin-web.spec +++ b/fedora/jellyfin-web.spec @@ -2,7 +2,7 @@ Name: jellyfin-web Version: 10.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Free Software Media System web client License: GPLv3 URL: https://jellyfin.org