Branch: master

a96b8395 2016-05-07 12:16:10 François Andriot
RPM Packaging: update tdelibs dependencies
M redhat/main/tdelibs/tdelibs-14.0.0.spec
M redhat/packages.el7
M redhat/packages.f23
diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec
index 9f2b030..d0d61a3 100644
--- a/redhat/main/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec
@@ -404,9 +404,7 @@
 %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 @@
 %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 8c94a8c..6a635a7 100644
--- a/redhat/packages.el7
+++ b/redhat/packages.el7
@@ -173,3 +173,8 @@
 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 9863d8c..a7bcf9f 100644
--- a/redhat/packages.f23
+++ b/redhat/packages.f23
@@ -200,3 +200,4 @@
 opensc
 pcsc-lite-devel
 pkcs11-helper-devel
+libvncserver-devel