!85 split GUI part from firewalld to firewall-config
From: @sherlock2010 Reviewed-by: @sunsuwan Signed-off-by: @sunsuwan
This commit is contained in:
commit
af20b16929
@ -1,6 +1,6 @@
|
|||||||
Name: firewalld
|
Name: firewalld
|
||||||
Version: 1.2.6
|
Version: 1.2.6
|
||||||
Release: 5
|
Release: 6
|
||||||
Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
|
Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://www.firewalld.org
|
URL: http://www.firewalld.org
|
||||||
@ -21,9 +21,6 @@ BuildRequires: libxslt iptables ebtables ipset python3-devel
|
|||||||
|
|
||||||
|
|
||||||
Requires: iptables iptables-nft ipset systemd
|
Requires: iptables iptables-nft ipset systemd
|
||||||
%if %{?openEuler:1}0
|
|
||||||
Requires: hicolor-icon-theme python3-gobject NetworkManager-libnm dbus-x11 gtk3
|
|
||||||
%endif
|
|
||||||
Requires: python3-firewall = %{version}-%{release}
|
Requires: python3-firewall = %{version}-%{release}
|
||||||
Suggests: iptables-nft
|
Suggests: iptables-nft
|
||||||
|
|
||||||
@ -40,8 +37,8 @@ Obsoletes: firewalld-config-cloud <= 0.3.15
|
|||||||
Obsoletes: firewalld-config-server <= 0.3.15
|
Obsoletes: firewalld-config-server <= 0.3.15
|
||||||
Obsoletes: firewalld-config-workstation <= 0.3.15
|
Obsoletes: firewalld-config-workstation <= 0.3.15
|
||||||
|
|
||||||
Provides: firewalld-filesystem = %{version}-%{release} firewall-config = %{version}-%{release}
|
Provides: firewalld-filesystem = %{version}-%{release}
|
||||||
Obsoletes: firewalld-filesystem < %{version}-%{release} firewall-config < %{version}-%{release}
|
Obsoletes: firewalld-filesystem < %{version}-%{release}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
firewalld is a firewall service daemon that provides a dynamic customizable
|
firewalld is a firewall service daemon that provides a dynamic customizable
|
||||||
@ -71,6 +68,18 @@ Summary: Firewalld testsuite
|
|||||||
%description -n firewalld-test
|
%description -n firewalld-test
|
||||||
This package provides the firewalld testsuite.
|
This package provides the firewalld testsuite.
|
||||||
|
|
||||||
|
%if %{?openEuler:1}0
|
||||||
|
%package -n firewall-config
|
||||||
|
Summary: Firewall GUI configuration application
|
||||||
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
Requires: python3-firewall = %{version}-%{release}
|
||||||
|
Requires: hicolor-icon-theme python3-gobject NetworkManager-libnm dbus-x11 gtk3
|
||||||
|
Recommends: polkit
|
||||||
|
|
||||||
|
%description -n firewall-config
|
||||||
|
GUI configuration interface for firewalld.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{version} -p1
|
%autosetup -n %{name}-%{version} -p1
|
||||||
@ -155,9 +164,6 @@ sed -i "s/CleanupModulesOnExit=no/CleanupModulesOnExit=yes/g" %{_sysconfdir}/fir
|
|||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%doc COPYING README.md
|
%doc COPYING README.md
|
||||||
%{_sbindir}/firewalld
|
%{_sbindir}/firewalld
|
||||||
%if %{?openEuler:1}0
|
|
||||||
%{_bindir}/firewall-config
|
|
||||||
%endif
|
|
||||||
%{_bindir}/firewall-cmd
|
%{_bindir}/firewall-cmd
|
||||||
%{_bindir}/firewall-offline-cmd
|
%{_bindir}/firewall-offline-cmd
|
||||||
%{_datadir}/bash-completion/completions/firewall-cmd
|
%{_datadir}/bash-completion/completions/firewall-cmd
|
||||||
@ -182,9 +188,7 @@ sed -i "s/CleanupModulesOnExit=no/CleanupModulesOnExit=yes/g" %{_sysconfdir}/fir
|
|||||||
%{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.server.policy.choice
|
%{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.server.policy.choice
|
||||||
%ghost %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
|
%ghost %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
|
||||||
%{_sysconfdir}/modprobe.d/firewalld-sysctls.conf
|
%{_sysconfdir}/modprobe.d/firewalld-sysctls.conf
|
||||||
%if %{!?openEuler:1}0
|
|
||||||
%attr (0700,root,root) %{_datadir}/firewalld/firewalld-tmp-mmap
|
%attr (0700,root,root) %{_datadir}/firewalld/firewalld-tmp-mmap
|
||||||
%endif
|
|
||||||
%config(noreplace) %{_sysconfdir}/logrotate.d/firewalld
|
%config(noreplace) %{_sysconfdir}/logrotate.d/firewalld
|
||||||
%{_rpmconfigdir}/macros.d/macros.firewalld
|
%{_rpmconfigdir}/macros.d/macros.firewalld
|
||||||
|
|
||||||
@ -197,13 +201,15 @@ sed -i "s/CleanupModulesOnExit=no/CleanupModulesOnExit=yes/g" %{_sysconfdir}/fir
|
|||||||
%exclude %{_mandir}/man1/firewall-applet*.1*
|
%exclude %{_mandir}/man1/firewall-applet*.1*
|
||||||
|
|
||||||
%if %{?openEuler:1}0
|
%if %{?openEuler:1}0
|
||||||
|
%files -n firewall-config
|
||||||
|
%{_bindir}/firewall-config
|
||||||
%defattr(0644,root,root)
|
%defattr(0644,root,root)
|
||||||
%attr (0700,root,root) %{_datadir}/firewalld/firewalld-tmp-mmap
|
|
||||||
%{_datadir}/firewalld/*
|
%{_datadir}/firewalld/*
|
||||||
%{_datadir}/applications/firewall-config.desktop
|
%{_datadir}/applications/firewall-config.desktop
|
||||||
%{_datadir}/metainfo/firewall-config.appdata.xml
|
%{_datadir}/metainfo/firewall-config.appdata.xml
|
||||||
%{_datadir}/icons/hicolor/*/apps/firewall-config*.*
|
%{_datadir}/icons/hicolor/*/apps/firewall-config*.*
|
||||||
%{_datadir}/glib-2.0/schemas/org.fedoraproject.FirewallConfig.gschema.xml
|
%{_datadir}/glib-2.0/schemas/org.fedoraproject.FirewallConfig.gschema.xml
|
||||||
|
%exclude %{_datadir}/firewalld/firewalld-tmp-mmap
|
||||||
%endif
|
%endif
|
||||||
%exclude %{_datadir}/firewalld/testsuite/*
|
%exclude %{_datadir}/firewalld/testsuite/*
|
||||||
|
|
||||||
@ -238,6 +244,12 @@ sed -i "s/CleanupModulesOnExit=no/CleanupModulesOnExit=yes/g" %{_sysconfdir}/fir
|
|||||||
%{_datadir}/firewalld/testsuite/python/firewalld_test.py
|
%{_datadir}/firewalld/testsuite/python/firewalld_test.py
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 11 2024 zhouyihang <zhouyihang3@h-partners.com> - 1.2.6-6
|
||||||
|
- Type:requirement
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:split GUI part from firewalld to firewall-config
|
||||||
|
|
||||||
* Fri Jul 05 2024 zhouyihang <zhouyihang3@h-partners.com> - 1.2.6-5
|
* Fri Jul 05 2024 zhouyihang <zhouyihang3@h-partners.com> - 1.2.6-5
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user