diff options
| author | François Andriot <albator78@libertysurf.fr> | 2024-06-13 08:37:13 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2024-06-13 08:38:31 +0200 |
| commit | ac47c91c6c011631186592695e4251a3bb97dcca (patch) | |
| tree | d91e4e98d96b4b2618d9fb3b879c28b67fc63a8f /redhat/applications/settings/kkbswitch/kkbswitch.spec | |
| parent | 1488354ed514d043f0c15ddbe8b9aa7c0b43f46c (diff) | |
| download | tde-packaging-ac47c91c6c011631186592695e4251a3bb97dcca.tar.gz tde-packaging-ac47c91c6c011631186592695e4251a3bb97dcca.zip | |
RPM: synchronize redhat directory with r14.1.x branch
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/applications/settings/kkbswitch/kkbswitch.spec')
| -rw-r--r-- | redhat/applications/settings/kkbswitch/kkbswitch.spec | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/redhat/applications/settings/kkbswitch/kkbswitch.spec b/redhat/applications/settings/kkbswitch/kkbswitch.spec index 4381ff697..81cea639a 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.0 +%define tde_version 14.1.2 %endif %define tde_pkg kkbswitch %define tde_prefix /opt/trinity @@ -66,16 +66,28 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # XKBFILES support +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}xkbfile-devel +%else BuildRequires: libxkbfile-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -119,7 +131,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi |