From b5af74266010bf1964e481909d1ae84420419a1a Mon Sep 17 00:00:00 2001 From: sherlock2010 <15151851377@163.com> Date: Wed, 8 May 2024 03:57:19 +0000 Subject: [PATCH] fix unintentionally exclude file in non-openeuler env --- firewalld.spec | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/firewalld.spec b/firewalld.spec index 5f6b865..019421f 100644 --- a/firewalld.spec +++ b/firewalld.spec @@ -1,6 +1,6 @@ Name: firewalld Version: 1.0.2 -Release: 8 +Release: 9 Summary: A firewall daemon with D-Bus interface providing a dynamic firewall License: GPLv2+ URL: http://www.firewalld.org @@ -209,13 +209,6 @@ sed -i "s/CleanupModulesOnExit=no/CleanupModulesOnExit=yes/g" %{_sysconfdir}/fir %{_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/* @@ -228,6 +221,15 @@ sed -i "s/CleanupModulesOnExit=no/CleanupModulesOnExit=yes/g" %{_sysconfdir}/fir %defattr(-,root,root) %{python3_sitelib}/firewall/* +%if %{!?openEuler:1}0 +%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 + %files -n firewalld-test %dir %{_datadir}/firewalld/testsuite %{_datadir}/firewalld/testsuite/README @@ -241,6 +243,12 @@ sed -i "s/CleanupModulesOnExit=no/CleanupModulesOnExit=yes/g" %{_sysconfdir}/fir %{_datadir}/firewalld/testsuite/python/firewalld_test.py %changelog +* Wed May 08 2024 zhouyihang - 1.0.2-9 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix unintentionally exclude file in non-openeuler env + * Wed Nov 29 2023 zhanghao - 1.0.2-8 - Type:requirement - ID:NA -- Gitee