From 4d09d801360e7cd3747ceb0f0e2c2bdd0c1db324 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Tue, 22 Sep 2026 06:25:10 -0300 Subject: RPM tqca-tls: update packaging for TDE master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RPM tqca-tls: update packaging for TDE master Consolidate the final validated packaging changes for tqca-tls from the Tumbleweed build series. Original commits represented: 4. Signed-off-by: Sebastião Guerra --- redhat/dependencies/tqca-tls/tqca-tls.spec | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec index bc76e9208..6d9381b7b 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls.spec @@ -54,14 +54,17 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 +BuildRequires: libtqt3-mt-devel >= 3.5.0 +BuildRequires: tqt3-dev-tools >= 3.5.0 BuildRequires: libtqca-devel >= %{tde_epoch}:1.0 BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ # OPENSSL support -%if 0%{?mdkver} +%if 0%{?suse_version} +BuildRequires: libopenssl-devel +%elif 0%{?mdkver} BuildRequires: %{_lib}openssl-devel %else BuildRequires: openssl-devel @@ -106,11 +109,7 @@ contains the TLS plugin. %build unset QTDIR QTINC QTLIB - -if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then - %__mkdir_p build - cd build -fi +export PKG_CONFIG_PATH="%{_libdir}/pkgconfig:${PKG_CONFIG_PATH}" %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ @@ -119,10 +118,13 @@ fi -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=OFF \ + -DTQT_FOUND=ON \ + -DTQT_PREFIX=%{_prefix} \ + -DTQT_INCLUDE_DIRS=%{_includedir}/tqt3 \ + -DTQT_LIBRARY_DIRS=%{_libdir} \ + -DTQT_LIBRARIES=tqt-mt \ \ - -DWITH_ALL_OPTIONS="ON" \ - \ - .. + -DWITH_ALL_OPTIONS="ON" %__make %{?_smp_mflags} || %__make -- cgit v1.2.3