From 573c942202ccf2fcaf0fd8180abc11e56a4c28bf Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Wed, 10 Mar 2021 09:37:44 -0500 Subject: [PATCH 1/2] pull fedora changes into master branch --- fedora/jellyfin-web.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fedora/jellyfin-web.spec b/fedora/jellyfin-web.spec index ac3ce3bdb76..98e2c9de58a 100644 --- a/fedora/jellyfin-web.spec +++ b/fedora/jellyfin-web.spec @@ -2,11 +2,11 @@ Name: jellyfin-web Version: 10.8.0 -Release: 1%{?dist} +Release: 2%{?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} @@ -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 @@ -38,7 +41,8 @@ mv dist %{buildroot}%{_datadir}/jellyfin-web %{__install} -D -m 0644 LICENSE %{buildroot}%{_datadir}/licenses/jellyfin/LICENSE %files -%attr(755,root,root) %{_datadir}/jellyfin-web +%defattr(644,root,root,755) +%{_datadir}/jellyfin-web %{_datadir}/licenses/jellyfin/LICENSE %changelog From f78426c1d000049706624a170aa5753cdf046cd4 Mon Sep 17 00:00:00 2001 From: dkanada Date: Tue, 23 Mar 2021 13:35:15 +0900 Subject: [PATCH 2/2] revert release version bump in fedora spec --- 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 98e2c9de58a..3528c8b4d3c 100644 --- a/fedora/jellyfin-web.spec +++ b/fedora/jellyfin-web.spec @@ -2,7 +2,7 @@ Name: jellyfin-web Version: 10.8.0 -Release: 2%{?dist} +Release: 1%{?dist} Summary: The Free Software Media System web client License: GPLv3 URL: https://jellyfin.org