From ae2a5ca1f263a80fb1cb8f82d54c0251ff1efabe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Wed, 3 May 2023 23:02:51 +0200 Subject: RPM: update build scripts for pclinuxos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/applications/office/kbibtex/kbibtex.spec | 2 +- redhat/applications/office/koffice/koffice.spec | 2 ++ redhat/applications/office/tellico/tellico.spec | 6 +----- redhat/applications/settings/tde-guidance/tde-guidance.spec | 6 +++--- 4 files changed, 7 insertions(+), 9 deletions(-) (limited to 'redhat/applications') diff --git a/redhat/applications/office/kbibtex/kbibtex.spec b/redhat/applications/office/kbibtex/kbibtex.spec index bef708968..7026fc21e 100644 --- a/redhat/applications/office/kbibtex/kbibtex.spec +++ b/redhat/applications/office/kbibtex/kbibtex.spec @@ -80,7 +80,7 @@ BuildRequires: openssl-devel BuildRequires: libxslt-devel # YAZ support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version} BuildRequires: libyaz-devel %endif diff --git a/redhat/applications/office/koffice/koffice.spec b/redhat/applications/office/koffice/koffice.spec index e137cc9b9..841a44c04 100644 --- a/redhat/applications/office/koffice/koffice.spec +++ b/redhat/applications/office/koffice/koffice.spec @@ -246,7 +246,9 @@ BuildRequires: wv2-devel # MESA support %if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?pclinuxos} == 0 BuildRequires: %{_lib}mesagl-devel +%endif BuildRequires: %{_lib}mesaglu1-devel %endif %if 0%{?fedora} || 0%{?rhel} diff --git a/redhat/applications/office/tellico/tellico.spec b/redhat/applications/office/tellico/tellico.spec index ee92c8f4b..636c6deb2 100644 --- a/redhat/applications/office/tellico/tellico.spec +++ b/redhat/applications/office/tellico/tellico.spec @@ -220,14 +220,10 @@ documentation. %{tde_datadir}/apps/tellico/*.xml %{tde_datadir}/apps/tellico/*.png %{tde_datadir}/apps/tellico/entry-templates -%if 0%{?rhel} == 7 || 0%{?suse_version} %{tde_datadir}/apps/tellico/*.py* -%if 0%{?rhel} == 7 +%if 0%{?rhel} == 7 || 0%{?mgaversion} >= 8 %{tde_datadir}/apps/tellico/__pycache__/ %endif -%else -%pycached %{tde_datadir}/apps/tellico/*.py -%endif %{tde_datadir}/apps/tellico/pics %{tde_datadir}/apps/tellico/report-templates %{tde_datadir}/apps/tellico/tellico.dtd diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec index 946a06d97..c743098c2 100644 --- a/redhat/applications/settings/tde-guidance/tde-guidance.spec +++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec @@ -191,7 +191,7 @@ or can be run as standalone applications. %{tde_datadir}/apps/guidance/ %{tde_tdeappdir}/*.desktop %{tde_datadir}/icons/crystalsvg/*/*/*.png -%if 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitearch}/%{name}/SMBShareSelectDialog.py* %{python_sitearch}/%{name}/SimpleCommandRunner.py* %{python_sitearch}/%{name}/fuser.py* @@ -259,7 +259,7 @@ Guidance configuration tools. %files backends %defattr(-,root,root,-) %dir %{python_sitearch}/%{name} -%if 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitearch}/%{name}/MicroHAL.py* %{python_sitearch}/%{name}/drivedetect.py* %{python_sitearch}/%{name}/wineread.py* @@ -307,7 +307,7 @@ suspend using HAL. %files powermanager %defattr(-,root,root,-) %{tde_bindir}/guidance-power-manager -%if 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitearch}/%{name}/MicroHAL.py* %{python_sitearch}/%{name}/guidance-power-manager.py* %{python_sitearch}/%{name}/powermanage.py* -- cgit v1.2.1