RPM: massive update and cleanup

2 files changed, 19 insertions, 127 deletions

diff --git a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec
deleted file mode 100644
index 8892b1ec2..000000000
--- a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec
+++ /dev/null
@@ -1,122 +0,0 @@
-#
-# spec file for package tqca-tls (version 3.5.13-SRU)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# TDE variables
-%define tde_epoch 1
-%define tde_version 3.5.13.2
-%define tde_pkg tqca-tls
-%define tde_prefix /opt/trinity
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
-%define libtqt3 %{_lib}qt3
-%else
-%define libtqt3 libqt3
-%endif
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	1.0
-Release:	%{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	TLS plugin for the TQt Cryptographic Architecture
-Group:		Applications/Internet
-URL:		http://delta.affinix.com/qca/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		tqca-tls-3.5.13.2.tar.gz
-
-BuildRequires:  libtqt4-devel >= %{tde_epoch}:4.2.0
-BuildRequires:	libtqca-devel >= %{tde_epoch}:1.0
-
-BuildRequires:	gcc-c++
-BuildRequires:	openssl-devel >= 0.9.8
-
-
-%description
-This is a plugin to provide SSL/TLS capability to programs that use the TQt
-Cryptographic Architecture (TQCA).  TQCA is a library providing an easy API
-for several cryptographic algorithms to TQt programs.  This package only
-contains the TLS plugin.
-
-##########
-
-%package -n %{libtqt3}-mt-tqca-tls
-Summary:	TLS plugin for the TQt Cryptographic Architecture
-Group:		Applications/Internet
-
-%description -n %{libtqt3}-mt-tqca-tls
-This is a plugin to provide SSL/TLS capability to programs that use the TQt
-Cryptographic Architecture (TQCA).  TQCA is a library providing an easy API
-for several cryptographic algorithms to TQt programs.  This package only
-contains the TLS plugin.
-
-%files -n %{libtqt3}-mt-tqca-tls
-%defattr(0644,root,root,0755)
-%doc README COPYING
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%{_libdir}/qt3/plugins/crypto/libqca-tls.so
-%endif
-%if 0%{?suse_version}
-%{_usr}/lib/qt3/plugins/crypto/libqca-tls.so
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-%{_libdir}/qt-3.3/plugins/crypto/libqca-tls.so
-%endif
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n tqca-tls-3.5.13.2
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-
-./configure
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install INSTALL_ROOT=%{?buildroot}
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec
index 0323731dc..3f5d9d109 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
 %endif
 %define tde_pkg tqca-tls
 %define tde_prefix /opt/trinity
@@ -100,15 +100,29 @@ contains the TLS plugin.
 %build
 unset QTDIR QTINC QTLIB
 
-./configure \
-  --qtdir=%{_prefix}
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
 
-%__make %{?_smp_mflags}
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+ -DWITH_ALL_OPTIONS="ON" \
+ \
+  ..
+
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 %__rm -rf %{?buildroot}
-%__make install INSTALL_ROOT=%{?buildroot}
+%__make install DESTDIR="%{?buildroot}" -C build
 
 
 %clean