summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2016-05-07 19:16:10 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2016-05-07 19:16:10 +0200
commita96b839557aae5ac79add2bcd90edd5d007b4ed1 (patch)
treeeb1cdbb794f4b123a945ec86257693b5b4c8ff7a
parent3a2fc9529691a2bfb6212014d9055f8052b91f8b (diff)
downloadtde-packaging-a96b839557aae5ac79add2bcd90edd5d007b4ed1.tar.gz
tde-packaging-a96b839557aae5ac79add2bcd90edd5d007b4ed1.zip
RPM Packaging: update tdelibs dependencies
-rw-r--r--redhat/main/tdelibs/tdelibs-14.0.0.spec7
-rw-r--r--redhat/packages.el75
-rw-r--r--redhat/packages.f231
3 files changed, 10 insertions, 3 deletions
diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec
index 9f2b03077..d0d61a3c4 100644
--- a/redhat/main/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec
@@ -404,9 +404,7 @@ BuildRequires: pkcs11-helper-devel
%endif
# OPENSC support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 7 || 0%{?fedora} || 0%{?suse_version}
BuildRequires: opensc
-%endif
# CRYPTSETUP support
%if 0%{?mdkversion} || 0%{?mgaversion}
@@ -415,9 +413,12 @@ BuildRequires: %{_lib}cryptsetup-devel
%if 0%{?suse_version}
BuildRequires: libcryptsetup-devel
%endif
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} >= 7 || 0%{?fedora}
BuildRequires: cryptsetup-devel
%endif
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6
+BuildRequires: cryptsetup-luks-devel
+%endif
# ELFICON support
%if 0
diff --git a/redhat/packages.el7 b/redhat/packages.el7
index 8c94a8c56..6a635a7c3 100644
--- a/redhat/packages.el7
+++ b/redhat/packages.el7
@@ -173,3 +173,8 @@ lirc-devel
wireless-tools-devel
libudisks2-devel
cryptsetup-devel
+xine-lib-devel
+libassuan-devel
+libksba-devel
+db4-devel
+swig
diff --git a/redhat/packages.f23 b/redhat/packages.f23
index 9863d8c7b..a7bcf9faf 100644
--- a/redhat/packages.f23
+++ b/redhat/packages.f23
@@ -200,3 +200,4 @@ cryptsetup-devel
opensc
pcsc-lite-devel
pkcs11-helper-devel
+libvncserver-devel