From 4c78786737534ba658e3b33230b364850e31fbb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Mon, 7 Oct 2024 21:17:55 +0200 Subject: RPM: many updates for upcoming R14.1.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/applications/settings/kmyfirewall/kmyfirewall.spec | 1 + redhat/applications/settings/tde-guidance/tde-guidance.spec | 4 ++-- redhat/applications/settings/wlassistant/wlassistant.spec | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'redhat/applications/settings') diff --git a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec index 16d3e34ca..b5dbf456d 100644 --- a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec +++ b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec @@ -144,6 +144,7 @@ university etc.) %{tde_datadir}/mimelnk/application/kmfnet.desktop %{tde_datadir}/mimelnk/application/kmfpkg.desktop %{tde_datadir}/mimelnk/application/kmfrs.desktop +%{tde_datadir}/pixmaps/kmyfirewall.xpm %{tde_datadir}/services/kmf*.desktop %{tde_datadir}/servicetypes/kmf*.desktop %{tde_mandir}/man1/kmyfirewall.1* diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec index ccacc149f..65cb97f99 100644 --- a/redhat/applications/settings/tde-guidance/tde-guidance.spec +++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec @@ -183,7 +183,7 @@ or can be run as standalone applications. %{tde_datadir}/apps/guidance/ %{tde_tdeappdir}/*.desktop %{tde_datadir}/icons/crystalsvg/*/*/*.png -%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitelib}/tde-guidance/SMBShareSelectDialog.py* %{python_sitelib}/tde-guidance/SimpleCommandRunner.py* %{python_sitelib}/tde-guidance/fuser.py* @@ -249,7 +249,7 @@ Guidance configuration tools. %files backends %defattr(-,root,root,-) %dir %{python_sitelib}/tde-guidance -%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitelib}/tde-guidance/MicroHAL.py* %if 0%{?rhel} == 7 %{python_sitelib}/tde-guidance/__pycache__/MicroHAL.*.pyc diff --git a/redhat/applications/settings/wlassistant/wlassistant.spec b/redhat/applications/settings/wlassistant/wlassistant.spec index b60b75b61..2b52c07a3 100644 --- a/redhat/applications/settings/wlassistant/wlassistant.spec +++ b/redhat/applications/settings/wlassistant/wlassistant.spec @@ -82,8 +82,12 @@ BuildRequires: brp-check-trinity BuildRequires: wireless-tools-devel %endif %if 0%{?mgaversion} == 2 || 0%{?mdkversion} +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}iw-devel +%else BuildRequires: %{_lib}iw29-devel %endif +%endif %if 0%{?rhel} == 5 || 0%{?suse_version} BuildRequires: wireless-tools %endif -- cgit v1.2.1