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

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

1 files changed, 43 insertions, 7 deletions

diff --git a/redhat/core/tdegraphics/tdegraphics.spec b/redhat/core/tdegraphics/tdegraphics.spec
index 1be2d079d..67a60e45f 100644
--- a/redhat/core/tdegraphics/tdegraphics.spec
+++ b/redhat/core/tdegraphics/tdegraphics.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
 %endif
 %define tde_pkg tdegraphics
 %define tde_prefix /opt/trinity
@@ -95,29 +95,49 @@ BuildRequires:	libusb-devel
 %endif
 
 # MNG support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}mng-devel
+%else
 BuildRequires: libmng-devel
+%endif
 
 # TIFF support
-BuildRequires: libtiff-devel
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}tiff-devel
+%else
+BuildRequires:	libtiff-devel
+%endif
 
 # PCRE support
 BuildRequires: pcre-devel
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # GIF support
 %if 0%{?suse_version} || 0%{?fedora} >= 28 || 0%{?rhel} >= 8
 BuildRequires: giflib-devel
 %else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gif-devel
+%else
 BuildRequires: libungif-devel
 %endif
+%endif
 
 # GPHOTO2 support
-%if 0%{?suse_version}
-BuildRequires: libgphoto2-devel
+%if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}gphoto-devel
 %else
-BuildRequires: gphoto2-devel
+BuildRequires:	gphoto2-devel
+%endif
+%else
+BuildRequires:	libgphoto2-devel
 %endif
 
 # PAPER support
@@ -169,7 +189,7 @@ BuildRequires:	xorg-x11-libXmu-devel
 BuildRequires: libXmu-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion} >= 4
-BuildRequires: libxmu-devel
+BuildRequires: %{_lib}xmu-devel
 %endif
 %if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
 BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
@@ -181,8 +201,12 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver} >= 24090000
+BuildRequires: %{_lib}glu-devel
+%else
 BuildRequires: mesaglu-devel
 %endif
+%endif
 %if 0%{?suse_version}
 BuildRequires: Mesa-libGL-devel
 BuildRequires: Mesa-libGLU-devel
@@ -195,11 +219,19 @@ BuildRequires:	xorg-x11-Mesa-libGLU
 %if 0%{?rhel} == 4
 BuildRequires:	xorg-x11-devel
 %else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}drm-devel
+%else
 BuildRequires: libdrm-devel
 %endif
+%endif
 
 # OPENEXR support
+%if 0%{?mdkver} >= 24090000
+BuildRequires:	%{_lib}openexr-devel
+%else
 BuildRequires:	OpenEXR-devel
+%endif
 
 # POPPLER support
 %define with_pdf 1
@@ -231,7 +263,11 @@ BuildRequires: lcms-devel
 BuildRequires: fribidi-devel
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # kamera
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
@@ -1058,7 +1094,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