From 4a082768066b2b3ac46d6aaa2f6954be6e021d1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Tue, 14 Apr 2020 12:07:03 +0200
Subject: RPM: various updates for TDE 14.0.8

---
 redhat/dependencies/tqca/tqca.spec | 43 ++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 16 deletions(-)

(limited to 'redhat/dependencies/tqca/tqca.spec')

diff --git a/redhat/dependencies/tqca/tqca.spec b/redhat/dependencies/tqca/tqca.spec
index 0ea095f6a..316db8d06 100644
--- a/redhat/dependencies/tqca/tqca.spec
+++ b/redhat/dependencies/tqca/tqca.spec
@@ -56,6 +56,7 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source1:		trinity-tqca-rpmlintrc
 
 BuildRequires:  libtqt4-devel >= %{tde_epoch}:4.2.0
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 
 %description
@@ -98,9 +99,8 @@ application!
 %files -n %{libtqca}1
 %defattr(-,root,root,-)
 %doc COPYING README TODO
-%{_libdir}/libqca.so.1
-%{_libdir}/libqca.so.1.0
-%{_libdir}/libqca.so.1.0.0
+%{_libdir}/libtqca.so.1
+%{_libdir}/libtqca.so.1.0.0
 
 ##########
 
@@ -124,8 +124,11 @@ This packages contains the development files for TQCA
 
 %files -n %{libtqca}-devel
 %defattr(-,root,root,-)
-%{_includedir}/qca.h
-%{_libdir}/libqca.so
+%{_includedir}/tqt3/tqca.h
+%{_includedir}/tqt3/tqcaprovider.h
+%{_libdir}/libtqca.la
+%{_libdir}/libtqca.so
+%{_libdir}/pkgconfig/tqca.pc
 
 ##########
 
@@ -145,23 +148,31 @@ perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra
 %build
 unset QTDIR QTINC QTLIB
 
-./configure \
-  --prefix=%{_prefix} \
-  --tqtdir=/usr \
-  --debug
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
 
+%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 \
+   \
+  -DINCLUDE_INSTALL_DIR=%{_includedir} \
+  -DLIB_INSTALL_DIR=%{_libdir} \
+  \
+  -DWITH_ALL_OPTIONS="ON" \
+  ..
 
-# Workaround strange tqmake behaviour in RHEL5
-%if 0%{?rhel} == 5
-%__sed -i "Makefile" -e "s|..\/..\/..\/..|%{_prefix}|g"
-%endif
-
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
-%__make install INSTALL_ROOT="${RPM_BUILD_ROOT}/"
+%__make install DESTDIR=%{?buildroot} -C build
 
 
 %clean
-- 
cgit v1.2.3