1 files changed, 46 insertions, 21 deletions

diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec
index c9d906451..aff20e142 100644
--- a/redhat/dependencies/tqt3/tqt3.spec
+++ b/redhat/dependencies/tqt3/tqt3.spec
@@ -64,13 +64,28 @@ BuildRequires: tar
 BuildRequires: zlib-devel
 
 # JPEG support
-BuildRequires: libjpeg-devel
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
+%{?libjpeg:BuildRequires: %{libjpeg}-devel}
 
 # MNG support
-BuildRequires: libmng-devel
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libmng %{_lib}mng
+%else
+%define libmng libmng
+%endif
+%{?libmng:BuildRequires: %{libmng}-devel}
 
 # PNG support
-BuildRequires: libpng-devel
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libpng %{_lib}png
+%else
+%define libpng libpng
+%endif
+%{?libpng:BuildRequires: %{libpng}-devel}
 
 # GIF support
 BuildRequires: giflib-devel
@@ -97,9 +112,12 @@ BuildRequires: cups-devel
 %{?glib2_devel:BuildRequires: %{glib2_devel}}
 
 # UUID support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
 %define uuid_devel libuuid-devel
 %endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define uuid_devel %{_lib}uuid-devel
+%endif
 %if 0%{?rhel} == 5
 %define uuid_devel e2fsprogs-devel
 %endif
@@ -108,8 +126,12 @@ BuildRequires: cups-devel
 # LIBAUDIO support
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_nas 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libaudio_devel %{_lib}audio-devel nas-devel
+%else
 %define libaudio_devel nas-devel
 %endif
+%endif
 %{?libaudio_devel:BuildRequires: %{libaudio_devel}}
 
 # Xrender support
@@ -117,7 +139,7 @@ BuildRequires: cups-devel
 %define xrender_devel libXrender-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%define xrender_devel libxrender-devel
+%define xrender_devel %{_lib}xrender-devel
 %endif
 %{?xrender_devel:BuildRequires: %{xrender_devel}}
 
@@ -126,11 +148,10 @@ BuildRequires: cups-devel
 %define xrandr_devel libXrandr-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
+%define xrandr_devel %{_lib}xrandr-devel
+%endif
 %if 0%{?pclinuxos}
 %define xrandr_devel %{_lib}xrandr2-devel
-%else
-%define xrandr_devel libxrandr-devel
-%endif
 %endif
 %{?xrandr_devel:BuildRequires: %{xrandr_devel}}
 
@@ -139,7 +160,7 @@ BuildRequires: cups-devel
 %define xcursor_devel libXcursor-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%define xcursor_devel libxcursor-devel
+%define xcursor_devel %{_lib}xcursor-devel
 %endif
 %{?xcursor_devel:BuildRequires: %{xcursor_devel}}
 
@@ -148,7 +169,7 @@ BuildRequires: cups-devel
 %define xinerama_devel libXinerama-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%define xinerama_devel libxinerama-devel
+%define xinerama_devel %{_lib}xinerama-devel
 %endif
 %{?xinerama_devel:BuildRequires: %{xinerama_devel}}
 
@@ -157,7 +178,7 @@ BuildRequires: cups-devel
 %define xft_devel libXft-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%define xft_devel libxft-devel
+%define xft_devel %{_lib}xft-devel
 %endif
 %{?xft_devel:BuildRequires: %{xft_devel}}
 
@@ -166,7 +187,7 @@ BuildRequires: cups-devel
 %define xext_devel libXext-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%define xext_devel libxext-devel
+%define xext_devel %{_lib}xext-devel
 %endif
 %{?xext_devel:BuildRequires: %{xext_devel}}
 
@@ -175,7 +196,7 @@ BuildRequires: cups-devel
 %define x11_devel libX11-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%define x11_devel libx11-devel
+%define x11_devel %{_lib}x11-devel
 %endif
 %{?x11_devel:BuildRequires: %{x11_devel}}
 
@@ -184,7 +205,7 @@ BuildRequires: cups-devel
 %define sm_devel libSM-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%define sm_devel libsm-devel
+%define sm_devel %{_lib}sm-devel
 %endif
 %{?sm_devel:BuildRequires: %{sm_devel}}
 
@@ -193,7 +214,7 @@ BuildRequires: cups-devel
 %define ice_devel libICE-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%define ice_devel libice-devel
+%define ice_devel %{_lib}ice-devel
 %endif
 %{?ice_devel:BuildRequires: %{ice_devel}}
 
@@ -210,7 +231,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
@@ -221,7 +242,7 @@ BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
 %define xi_devel xorg-x11-devel
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%define xi_devel libxi-devel
+%define xi_devel %{_lib}xi-devel
 %endif
 %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
 %define xi_devel libXi-devel
@@ -245,9 +266,13 @@ BuildRequires: mesa-libGLU-devel
 %if 0%{?pclinuxos}
 BuildRequires: MesaGLU-devel
 %else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}glu-devel
+%else
 BuildRequires: mesaglu-devel
 %endif
 %endif
+%endif
 %if 0%{?suse_version}
 BuildRequires: Mesa-libGL-devel
 BuildRequires: Mesa-libGLU-devel
@@ -281,7 +306,7 @@ BuildRequires:	firebird-devel
 %endif
 
 # FBCLIENT support
-%if 0%{?mgaversion} >= 6
+%if 0%{?mdkver} || 0%{?mgaversion} >= 6
 BuildRequires:	%{_lib}fbclient-devel
 %endif
 
@@ -297,7 +322,7 @@ BuildRequires:		libtirpc-devel
 BuildRequires:		libnsl-devel
 BuildRequires:		libtirpc-devel
 %endif
-%if 0%{?mgaversion}
+%if 0%{?mdkver} || 0%{?mgaversion}
 BuildRequires:		%{_lib}nsl-devel
 BuildRequires:		%{_lib}tirpc-devel
 %endif
@@ -378,8 +403,8 @@ Requires:	%{libtqt3}-mt = %{version}-%{release}
 Requires: glibc-devel
 Requires: fontconfig-devel
 Requires: freetype-devel
-Requires: libjpeg-devel
-Requires: libpng-devel
+Requires: %{libjpeg}-devel
+Requires: %{libpng}-devel
 Requires: zlib-devel
 
 %{?glib2_devel:Requires: %{glib2_devel}}