summaryrefslogtreecommitdiffstats
path: root/redhat/main
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2016-04-17 11:25:02 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2016-04-17 11:25:08 +0200
commitbc322573d8c7bd37edb2a7995e8c7070cdbcb886 (patch)
treefa1b9a94d6138a3caf58ad194c6dd7806ee3d67e /redhat/main
parent2485f53b3c83dcd87da8a0b0c3d432ed265726a1 (diff)
downloadtde-packaging-bc322573d8c7bd37edb2a7995e8c7070cdbcb886.tar.gz
tde-packaging-bc322573d8c7bd37edb2a7995e8c7070cdbcb886.zip
RPM Packaging: add libr/elficon stuff
Diffstat (limited to 'redhat/main')
-rw-r--r--redhat/main/tdebase/tdebase-14.0.0.spec8
-rw-r--r--redhat/main/tdelibs/tdelibs-14.0.0.spec11
2 files changed, 18 insertions, 1 deletions
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: