commit e24fcb48c9cd0a9ee279983cd2e6728ab3ceee44 Author: Michael Cronenworth <mike(a)cchtml.com&gt; Date: Wed Nov 23 11:27:09 2022 -0600 Drop firewalld sub-package as it is now upstream as of firewalld 1.2 jellyfin-firewalld.xml | 9 --------- jellyfin.spec | 32 ++++++-------------------------- 2 files changed, 6 insertions(+), 35 deletions(-) --- diff --git a/jellyfin.spec b/jellyfin.spec index e4bb0ae..a79446e 100644 --- a/jellyfin.spec +++ b/jellyfin.spec @@ -3,7 +3,7 @@ Name: jellyfin Version: 10.8.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Free Software Media System License: GPL-2.0-only URL: https://jellyfin.org @@ -22,8 +22,7 @@ Source12: %{name}.env Source13: %{name}.sudoers Source14: restart.sh Source15: %{name}.override.conf -Source16: %{name}-firewalld.xml -Source17: %{name}-server-lowports.conf +Source16: %{name}-server-lowports.conf # dotnet does not offer a runtime on ppc ExcludeArch: %{power64} ppc64le %{arm} @@ -39,7 +38,6 @@ Requires: %{name}-server = %{version}-%{release} Requires: %{name}-web = %{version}-%{release} # /etc/sudoers.d/ Requires: sudo -Requires: (%{name}-firewalld = %{version}-%{release} if firewalld) %description @@ -47,17 +45,6 @@ Jellyfin is a free software media system that puts you in control of managing and streaming your media. -%package firewalld -Summary: FirewallD metadata files for Jellyfin -Requires: firewalld-filesystem -Requires(post): firewalld-filesystem -BuildArch: noarch - - -%description firewalld -This package contains FirewallD files for Jellyfin. - - %package server # RPMfusion free Summary: The Free Software Media System Server backend @@ -146,7 +133,6 @@ install -p -m 644 -D Jellyfin.Server/Resources/Configuration/logging.json %{buil install -p -m 644 -D %{SOURCE12} %{buildroot}%{_sysconfdir}/sysconfig/jellyfin # system config -install -p -m 644 -D %{SOURCE16} %{buildroot}%{_prefix}/lib/firewalld/services/jellyfin.xml install -p -m 640 -D %{SOURCE13} %{buildroot}%{_sysconfdir}/sudoers.d/jellyfin-sudoers install -p -m 644 -D %{SOURCE15} %{buildroot}%{_sysconfdir}/systemd/system/jellyfin.service.d/override.conf install -p -m 644 -D %{SOURCE11} %{buildroot}%{_unitdir}/jellyfin.service @@ -158,7 +144,7 @@ mkdir -p %{buildroot}%{_localstatedir}/cache/jellyfin mkdir -p %{buildroot}%{_localstatedir}/log/jellyfin # jellyfin-server-lowports subpackage -install -p -m 644 -D %{SOURCE17} %{buildroot}%{_unitdir}/jellyfin.service.d/jellyfin-server-lowports.conf +install -p -m 644 -D %{SOURCE16} %{buildroot}%{_unitdir}/jellyfin.service.d/jellyfin-server-lowports.conf cd ../%{name}-web-%{version} # move web licenses prior to installation @@ -182,11 +168,6 @@ done # empty as this is just a meta-package -%files firewalld -%license LICENSE -%{_prefix}/lib/firewalld/services/jellyfin.xml - - %files server %license LICENSE # Jellyfin files @@ -223,10 +204,6 @@ done %{_datadir}/jellyfin-web -%post firewalld -%firewalld_reload - - %pre server getent group jellyfin >/dev/null || groupadd -r jellyfin getent passwd jellyfin >/dev/null || \ @@ -260,6 +237,9 @@ exit 0 %changelog +* Wed Nov 23 2022 Michael Cronenworth <mike(a)cchtml.com&gt; - 10.8.7-4 +- Drop firewalld sub-package as it is now upstream as of firewalld 1.2 + * Sun Nov 20 2022 Michael Cronenworth <mike(a)cchtml.com&gt; - 10.8.7-3 - Rebuild for dotnet-6.0.11