!34 add macros to control if need gtk hicolor-icon-theme, etc

From: @eaglegai 
Reviewed-by: @zengwefeng 
Signed-off-by: @zengwefeng
This commit is contained in:
openeuler-ci-bot 2022-06-30 09:12:32 +00:00 committed by Gitee
commit d4b9099e98
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -1,6 +1,6 @@
Name: firewalld
Version: 1.0.2
Release: 2
Release: 3
Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
License: GPLv2+
URL: http://www.firewalld.org
@ -15,7 +15,10 @@ BuildRequires: autoconf automake desktop-file-utils gettext intltool glib2 glib2
BuildRequires: libxslt iptables ebtables ipset python3-devel
Requires: iptables ebtables ipset systemd hicolor-icon-theme python3-gobject NetworkManager-libnm dbus-x11 gtk3
Requires: iptables ebtables ipset systemd
%if %{?openEuler:1}0
Requires: hicolor-icon-theme python3-gobject NetworkManager-libnm dbus-x11 gtk3
%endif
Requires: python3-firewall = %{version}-%{release}
Suggests: iptables-nft
@ -146,7 +149,9 @@ fi
%files -f %{name}.lang
%doc COPYING README
%{_sbindir}/firewalld
%if %{?openEuler:1}0
%{_bindir}/firewall-config
%endif
%{_bindir}/firewall-cmd
%{_bindir}/firewall-offline-cmd
%{_datadir}/bash-completion/completions/firewall-cmd
@ -171,6 +176,9 @@ fi
%{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.server.policy.choice
%ghost %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
%{_sysconfdir}/modprobe.d/firewalld-sysctls.conf
%if %{!?openEuler:1}0
%attr (0700,root,root) %{_datadir}/firewalld/firewalld-tmp-mmap
%endif
%config(noreplace) %{_sysconfdir}/logrotate.d/firewalld
%{_rpmconfigdir}/macros.d/macros.firewalld
@ -182,6 +190,7 @@ fi
%exclude %{_datadir}/icons/hicolor/*/apps/firewall-applet*.*
%exclude %{_mandir}/man1/firewall-applet*.1*
%if %{?openEuler:1}0
%defattr(0644,root,root)
%attr (0700,root,root) %{_datadir}/firewalld/firewalld-tmp-mmap
%{_datadir}/firewalld/*
@ -189,6 +198,14 @@ fi
%{_datadir}/metainfo/firewall-config.appdata.xml
%{_datadir}/icons/hicolor/*/apps/firewall-config*.*
%{_datadir}/glib-2.0/schemas/org.fedoraproject.FirewallConfig.gschema.xml
%else
%exclude %{_bindir}/firewall-config
%exclude %{_datadir}/firewalld/*
%exclude %{_datadir}/applications/firewall-config.desktop
%exclude %{_datadir}/metainfo/firewall-config.appdata.xml
%exclude %{_datadir}/icons/hicolor/*/apps/firewall-config*.*
%exclude %{_datadir}/glib-2.0/schemas/org.fedoraproject.FirewallConfig.gschema.xml
%endif
%exclude %{_datadir}/firewalld/testsuite/*
%files doc
@ -213,6 +230,12 @@ fi
%{_datadir}/firewalld/testsuite/python/firewalld_test.py
%changelog
* Thu Jun 30 2022 gaihuiying <eaglegai@163.com> - 1.0.2-3
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:add macros to control if need gtk hicolor-icon-theme, etc.
* Tue Jan 25 2022 yanglu <yanglu72@huawei.com> - 1.0.2-2
- Type:bugfix
- ID:NA