diff options
author | François Andriot <albator78@libertysurf.fr> | 2024-10-29 19:44:48 +0100 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2024-10-29 19:45:06 +0100 |
commit | 3c454513f03376d46c08645f47df63f6a7438c38 (patch) | |
tree | c3b74ebabf20994ae5fd4e020debd149fb2a3d6e /redhat/applications/settings | |
parent | c4fd5e03d482a437cf3192aea88e84450fb62994 (diff) | |
download | tde-packaging-3c454513f03376d46c08645f47df63f6a7438c38.tar.gz tde-packaging-3c454513f03376d46c08645f47df63f6a7438c38.zip |
RPM: Minor update after building all packages
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/applications/settings')
10 files changed, 25 insertions, 10 deletions
diff --git a/redhat/applications/settings/kima/kima.spec b/redhat/applications/settings/kima/kima.spec index b5dcaed59..5565798d5 100644 --- a/redhat/applications/settings/kima/kima.spec +++ b/redhat/applications/settings/kima/kima.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.2 +%define tde_version 14.1.3 %endif %define tde_pkg kima %define tde_prefix /opt/trinity @@ -81,7 +81,11 @@ BuildRequires: brp-check-trinity %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}udev1-devel +%else BuildRequires: %{_lib}udev-devel +%endif %else BuildRequires: libudev-devel %endif diff --git a/redhat/applications/settings/kiosktool/kiosktool.spec b/redhat/applications/settings/kiosktool/kiosktool.spec index 0fae4bcdc..59c3f32ca 100644 --- a/redhat/applications/settings/kiosktool/kiosktool.spec +++ b/redhat/applications/settings/kiosktool/kiosktool.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.2 +%define tde_version 14.1.3 %endif %define tde_pkg kiosktool %define tde_prefix /opt/trinity diff --git a/redhat/applications/settings/kkbswitch/kkbswitch.spec b/redhat/applications/settings/kkbswitch/kkbswitch.spec index 81cea639a..b16c72e5f 100644 --- a/redhat/applications/settings/kkbswitch/kkbswitch.spec +++ b/redhat/applications/settings/kkbswitch/kkbswitch.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.2 +%define tde_version 14.1.3 %endif %define tde_pkg kkbswitch %define tde_prefix /opt/trinity diff --git a/redhat/applications/settings/klcddimmer/klcddimmer.spec b/redhat/applications/settings/klcddimmer/klcddimmer.spec index 00dc8836c..599e73ed3 100644 --- a/redhat/applications/settings/klcddimmer/klcddimmer.spec +++ b/redhat/applications/settings/klcddimmer/klcddimmer.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.2 +%define tde_version 14.1.3 %endif %define tde_pkg klcddimmer %define tde_prefix /opt/trinity diff --git a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec index b5dbf456d..725b5ae63 100644 --- a/redhat/applications/settings/kmyfirewall/kmyfirewall.spec +++ b/redhat/applications/settings/kmyfirewall/kmyfirewall.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.2 +%define tde_version 14.1.3 %endif %define tde_pkg kmyfirewall %define tde_prefix /opt/trinity diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec index 65cb97f99..7931960ba 100644 --- a/redhat/applications/settings/tde-guidance/tde-guidance.spec +++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.2 +%define tde_version 14.1.3 %endif %define tde_pkg tde-guidance %define tde_prefix /opt/trinity @@ -377,6 +377,13 @@ fi %__rm -fr $RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT -C build +%if 0%{?pclinuxos} +if [ ! -d %{?buildroot}%{python_sitelib} ]; then + mkdir -p %{?buildroot}%{python_sitelib} + mv %{?buildroot}/tde-guidance %{?buildroot}%{python_sitelib} +fi +%endif + %clean %__rm -rf %{buildroot} diff --git a/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec index 39cf4c8dc..b56f76f6b 100644 --- a/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec +++ b/redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.2 +%define tde_version 14.1.3 %endif %define tde_pkg tde-systemsettings %define tde_prefix /opt/trinity diff --git a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec index 78b5236f7..0fc10afac 100644 --- a/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec +++ b/redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdenetworkmanager %define tde_prefix /opt/trinity @@ -141,7 +141,11 @@ BuildRequires: libacl-devel # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?pclinuxos} +BuildRequires: %{_lib}udev1-devel +%else BuildRequires: %{_lib}udev-devel +%endif %else BuildRequires: libudev-devel %endif diff --git a/redhat/applications/settings/tdesudo/tdesudo.spec b/redhat/applications/settings/tdesudo/tdesudo.spec index e14e40149..320dcecb6 100644 --- a/redhat/applications/settings/tdesudo/tdesudo.spec +++ b/redhat/applications/settings/tdesudo/tdesudo.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.2 +%define tde_version 14.1.3 %endif %define tde_pkg tdesudo %define tde_prefix /opt/trinity diff --git a/redhat/applications/settings/wlassistant/wlassistant.spec b/redhat/applications/settings/wlassistant/wlassistant.spec index 2b52c07a3..389e33999 100644 --- a/redhat/applications/settings/wlassistant/wlassistant.spec +++ b/redhat/applications/settings/wlassistant/wlassistant.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.1.2 +%define tde_version 14.1.3 %endif %define tde_pkg wlassistant %define tde_prefix /opt/trinity |