From bc322573d8c7bd37edb2a7995e8c7070cdbcb886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 17 Apr 2016 11:25:02 +0200 Subject: RPM Packaging: add libr/elficon stuff --- redhat/main/tdebase/tdebase-14.0.0.spec | 8 +++++++- redhat/main/tdelibs/tdelibs-14.0.0.spec | 11 +++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'redhat/main') diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec index 8473edf0a..56177c354 100644 --- a/redhat/main/tdebase/tdebase-14.0.0.spec +++ b/redhat/main/tdebase/tdebase-14.0.0.spec @@ -1260,6 +1260,11 @@ plugdev group. %{tde_datadir}/icons/hicolor/*/apps/kcmspellchecking.png %{tde_tdedocdir}/HTML/en/tdefontview/ +# tdehwtray +%{tde_bindir}/tdehwdevicetray +%{tde_tdeappdir}/tdehwdevicetray.desktop +%{tde_datadir}/autostart/tdehwdevicetray-autostart.desktop + # The following features are not compiled under RHEL 5 and older %if 0%{?with_tderandrtray} %{tde_bindir}/tderandrtray @@ -2219,6 +2224,7 @@ already. Most users won't need this. %{tde_bindir}/%{tdm}ctl %{tde_bindir}/%{tdm}_greet %{tde_bindir}/krootimage +%{tde_bindir}/tdecryptocardwatcher %dir %{tdm_datadir} %dir %{tdm_datadir}/pics %{tdm_datadir}/pics/kdelogo.png @@ -3636,7 +3642,7 @@ fi %{?with_hal:-DWITH_HAL=ON} \ %{?!with_tdehwlib:-DWITH_TDEHWLIB=OFF} \ -DWITH_UPOWER=ON \ - -DWITH_ELFICON=OFF \ + -DWITH_ELFICON=ON \ \ -DBUILD_ALL=ON \ %if 0%{?suse_version} diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec index 52bec8d2e..1a08324ea 100644 --- a/redhat/main/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec @@ -404,6 +404,17 @@ BuildRequires: pkcs11-helper-devel %endif BuildRequires: opensc +# CRYPTSETUP support +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}cryptsetup-devel +%else +BuildRequires: libcryptsetup-devel +%endif + +# ELFICON support +%define with_elficon 1 +BuildRequires: libr-devel >= 0.6.0 + %description Libraries for the Trinity Desktop Environment: -- cgit v1.2.1