RPM: synchronize redhat directory with r14.1.x branchHEADmaster

Signed-off-by: François Andriot <albator78@libertysurf.fr>

1 files changed, 31 insertions, 5 deletions

diff --git a/redhat/core/tdeutils/tdeutils.spec b/redhat/core/tdeutils/tdeutils.spec
index eb42326d0..cd0c99dd7 100644
--- a/redhat/core/tdeutils/tdeutils.spec
+++ b/redhat/core/tdeutils/tdeutils.spec
@@ -21,7 +21,7 @@
 
 # TDE variables
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
 %endif
 %define tde_pkg tdeutils
 %define tde_prefix /opt/trinity
@@ -85,7 +85,9 @@ BuildRequires:	net-snmp-devel
 BuildRequires:	gmp-devel
 
 # PYTHON support
+%if "%{python}" == ""
 %global python python3
+%endif
 %global __python %__python3
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 BuildRequires:	%{python}
@@ -139,7 +141,11 @@ BuildRequires:	pcre-devel
 %endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # XSCREENSAVER support
 #  RHEL 8: available in EPEL
@@ -159,7 +165,11 @@ BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # CONSOLEHELPER (usermode) support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
@@ -169,9 +179,8 @@ BuildRequires:	openssl-devel
 %define dont_relink 1
 %endif
 
-%if "%{?tde_version}" == "14.1.0"
+%define build_superkaramba 1
 %define build_tdefilereplace 1
-%endif
 
 Requires: trinity-ark = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: trinity-kcalc = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -191,7 +200,9 @@ Requires: trinity-kregexpeditor = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: trinity-ksim = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: trinity-ktimer = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: trinity-tdewalletmanager = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?build_superkaramba}
 Requires: trinity-superkaramba = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
 %if 0%{?build_tdefilereplace}
 Requires: trinity-tdefilereplace = %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
@@ -756,6 +767,8 @@ keeps a master password to all wallets.
 
 ##########
 
+%if 0%{?build_superkaramba}
+
 %package -n trinity-superkaramba
 Summary:	A program based on karamba improving the eyecandy of TDE
 Group:		Applications/Utilities
@@ -785,6 +798,8 @@ Here are just some examples of the things that can be done:
 %{tde_tdedocdir}/HTML/en/superkaramba/
 %{tde_mandir}/man1/superkaramba.1*
 
+%endif
+
 ##########
 
 %if 0%{?build_tdefilereplace}
@@ -870,7 +885,7 @@ This package contains the development files for tdeutils.
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
-%if 0%{?rhel} == 5
+%if 0%{?rhel} == 5 && 0%{?build_superkaramba}
 # Reverts some older Python stuff
 %__sed -i "superkaramba/src/"*".cpp" \
        -e "s|PyBytes_CheckExact|PyString_CheckExact|g" \
@@ -890,7 +905,7 @@ if [ -d "/usr/X11R6" ]; then
   export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
   %__mkdir_p build
   cd build
 fi
@@ -914,6 +929,11 @@ fi
   -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
   -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
   \
+%if 0%{?fedora} == 39
+  -DPYTHON_LIBRARY="%{_libdir}/libpython3.11.so.1.0" \
+  -DPYTHON_INCLUDE_DIR="%{_includedir}/python3.11" \
+%endif
+  \
   -DWITH_DPMS=ON \
   %{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \
   -DWITH_ASUS=ON \
@@ -928,6 +948,8 @@ fi
   -DWITH_TDENEWSTUFF=ON \
   -DBUILD_ALL=ON \
   %{?!build_klaptopdaemon:-DBUILD_KLAPTOPDAEMON=OFF} \
+  %{?!build_superkaramba:-DBUILD_SUPERKARAMBA=OFF} \
+  %{?!build_tdefilereplace:-DBUILD_TDEFILEREPLACE=OFF} \
   ..
    
 %__make %{?_smp_mflags} || %__make
@@ -971,14 +993,18 @@ export PATH="%{tde_bindir}:${PATH}"
 # Fix desktop shortcut location
 if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then
   %__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
+%if 0%{?build_superkaramba}
   %__mv "%{?buildroot}%{tde_datadir}/applnk/Utilities/superkaramba.desktop" "%{?buildroot}%{tde_tdeappdir}/superkaramba.desktop"
+%endif
   %__rm -rf "%{?buildroot}%{tde_datadir}/applnk"
 fi
 
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
 %suse_update_desktop_file KEdit              Utility TextEditor
+%if 0%{?build_superkaramba}
 %suse_update_desktop_file superkaramba       Utility DesktopUtility
+%endif
 %suse_update_desktop_file KCharSelect        Utility Accessibility
 %suse_update_desktop_file khexedit           Utility Editor
 %suse_update_desktop_file Kjots              Utility TimeUtility