RPM Packaging: update tdelibs, tdebase

redhat/tdebase/tdebase-14.0.0.spec

@@ -19,7 +19,7 @@
 
 
 Name:		trinity-tdebase
-Version:	14.0.0
+Version:	%{tde_version}
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 License:	GPL
 Summary:	Trinity Base Programs
@@ -1740,14 +1740,12 @@ group.
 %{tde_tdelibdir}/media_propsdlgplugin.so
 %{tde_datadir}/services/media_propsdlgplugin.desktop
 
-
 %post tdeio-plugins
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 
 %postun tdeio-plugins
 update-desktop-database %{tde_appdir} 2> /dev/null || : 
 
-
 ##########
 
 %package -n trinity-tdepasswd
@@ -3289,14 +3287,20 @@ cd build
 %endif
 
 %cmake \
+  -DCMAKE_BUILD_TYPE="" \
+  -DCMAKE_C_FLAGS="-DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="-DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  \
   -DBIN_INSTALL_DIR="%{tde_bindir}" \
   -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
   -DLIB_INSTALL_DIR="%{tde_libdir}" \
   -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  -DCMAKE_SKIP_RPATH="OFF" \
   -DCONFIG_INSTALL_DIR="/etc/trinity" \
   -DSYSCONF_INSTALL_DIR="/etc/trinity" \
   -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+  \
   -DWITH_SASL=ON \
   -DWITH_LDAP=ON \
   -DWITH_SAMBA=ON \

redhat/tdelibs/tdelibs-14.0.0.spec

@@ -21,7 +21,7 @@
 %define _docdir %{tde_docdir}
 
 Name:		trinity-tdelibs
-Version:	14.0.0
+Version:	%{tde_version}
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 License:	GPL
 Summary:	TDE Libraries
@@ -48,6 +48,7 @@ Patch3:		tdelibs-14.0.0-devkitpower_support.patch
 Patch101:		tdelibs-14.0.0-xdg_dirs_set_path.patch
 Patch102:		tdelibs-14.0.0-cups_by_default.patch
 
+Patch201:		tdelibs-14.0.0-debug.patch
 
 Obsoletes:	tdelibs < %{version}-%{release}
 Provides:	tdelibs = %{version}-%{release}
@@ -435,6 +436,8 @@ applications for TDE.
 %patch101 -p1 -b .xdg_path
 %patch102 -p1 -b .cups_by_default
 
+%patch201 -p1 -b .debug
+
 
 %build
 unset QTDIR QTINC QTLIB
@@ -456,6 +459,12 @@ cd build
 %endif
 
 %cmake \
+  -DCMAKE_BUILD_TYPE="" \
+  -DCMAKE_C_FLAGS="-DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="-DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  \
   -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
   -DBIN_INSTALL_DIR="%{tde_bindir}" \
   -DDOC_INSTALL_DIR="%{tde_docdir}" \
@@ -463,7 +472,7 @@ cd build
   -DLIB_INSTALL_DIR="%{tde_libdir}" \
   -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
   -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  -DCMAKE_SKIP_RPATH=OFF \
+  \
   -DWITH_ALL_OPTIONS=ON \
   -DWITH_ARTS=ON \
   -DWITH_ALSA=ON \