8 files changed, 37 insertions, 32 deletions
diff --git a/redhat/dependencies/akode/akode.spec b/redhat/dependencies/akode/akode.spec
index 958b3eed4..68b357129 100644
--- a/redhat/dependencies/akode/akode.spec
+++ b/redhat/dependencies/akode/akode.spec
@@ -73,8 +73,12 @@ BuildRequires:	trinity-filesystem >= %{tde_version}
 # FLAC support
 %define _with_flac --with-flac
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos}
+BuildRequires: %{_lib}flac12-devel
+%else
 BuildRequires: %{_lib}flac-devel
 %endif
+%endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 BuildRequires: flac-devel
 %endif
@@ -91,7 +95,7 @@ BuildRequires: jack-audio-connection-kit-devel
 %endif
 
 # SAMPLERATE support
-%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?suse_version}
 %define _with_libsamplerate --with-libsamplerate
 %if 0%{?mdkversion} || 0%{?mgaversion}
 BuildRequires: %{_lib}samplerate-devel
@@ -130,7 +134,7 @@ BuildRequires:		libmad-devel
 %if 0%{?suse_version}
 BuildRequires: alsa-devel
 %else
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
 BuildRequires: %{_lib}asound-devel
 %else
 BuildRequires: alsa-lib-devel
@@ -139,7 +143,11 @@ BuildRequires: alsa-lib-devel
 
 # VORBIS support
 %if 0%{?mdkver} || 0%{?mgaversion}
+%if 0%{?pclinuxos}
+%define libvorbis_devel %{_lib}vorbis0-devel
+%else
 %define libvorbis_devel %{_lib}vorbis-devel
+%endif
 %else
 %define libvorbis_devel libvorbis-devel
 %endif
diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec
index 5b1ecb63a..b346ddd20 100644
--- a/redhat/dependencies/arts/arts.spec
+++ b/redhat/dependencies/arts/arts.spec
@@ -77,14 +77,18 @@ BuildRequires:	gsl-devel
 
 # VORBIS support
 %if 0%{?mdkver} || 0%{?mgaversion}
+%if 0%{?pclinuxos}
+%define libvorbis_devel %{_lib}vorbis0-devel
+%else
 %define libvorbis_devel %{_lib}vorbis-devel
+%endif
 %else
 %define libvorbis_devel libvorbis-devel
 %endif
 BuildRequires: %{libvorbis_devel}
 
 # ALSA support
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
 %define alsa_devel %{_lib}asound-devel
 %else
 %define alsa_devel alsa-lib-devel
diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec
index 0fe560871..8b4326efe 100644
--- a/redhat/dependencies/libcaldav/libcaldav.spec
+++ b/redhat/dependencies/libcaldav/libcaldav.spec
@@ -60,7 +60,7 @@ BuildRequires:	libtool
 BuildRequires:	fdupes
 
 # GTK2 support
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
 BuildRequires:	%{_lib}gtk+2.0-devel
 %else
 %if 0%{?rhel} == 4
diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec
index cf992da1e..09785cd0a 100644
--- a/redhat/dependencies/libcarddav/libcarddav.spec
+++ b/redhat/dependencies/libcarddav/libcarddav.spec
@@ -73,7 +73,7 @@ BuildRequires:	libtool
 %{?libcurl_devel:BuildRequires: %{libcurl_devel}}
 
 # GTK2 support
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
 BuildRequires:	%{_lib}gtk+2.0-devel
 %else
 %if 0%{?rhel} == 4
diff --git a/redhat/dependencies/pytqt/pytqt.spec b/redhat/dependencies/pytqt/pytqt.spec
index ade0f5694..9338cb478 100644
--- a/redhat/dependencies/pytqt/pytqt.spec
+++ b/redhat/dependencies/pytqt/pytqt.spec
@@ -83,16 +83,15 @@ BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 
 # MESA support
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel}
 BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 %endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver}
-BuildRequires: %{_lib}glu-devel
-%else
-BuildRequires: mesaglu-devel
+%if 0%{?mgaversion} || 0%{?pclinuxos}
+BuildRequires: %{_lib}mesaglu1-devel
 %endif
+%if 0%{?mdkver} >= 5000000
+BuildRequires: %{_lib}glu-devel
 %endif
 %if 0%{?suse_version}
 BuildRequires: Mesa-libGL-devel
@@ -146,7 +145,7 @@ same way in both languages (with syntax differences, of course)
 %defattr(-,root,root,-)
 %doc NEWS README
 %dir %{python_sitearch}/PyTQt
-%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
 %{python_sitearch}/PyTQt/__init__.py*
 %if 0%{?rhel} == 7
 %{python_sitearch}/PyTQt/__pycache__/__init__.*.pyc
@@ -236,7 +235,7 @@ packages based on them, like PyTDE.
 
 %files -n pytqt-devel
 %defattr(-,root,root,-)
-%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
 %{python_sitearch}/PyTQt/pytqtconfig.py*
 %if 0%{?rhel} == 7
 %{python_sitearch}/PyTQt/__pycache__/pytqtconfig.*.pyc
diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
index f4ce700ae..29eaaad2d 100644
--- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec
+++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
@@ -113,7 +113,7 @@ specificity towards C++ and Python.
 %files -n sip4-tqt
 %defattr(-,root,root,-)
 %{python_sitearch}/sip_tqt.so
-%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%if 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
 %{python_sitearch}/sip_tqt_config.py*
 %{python_sitearch}/sip_tqt_distutils.py*
 %if 0%{?rhel} == 7
diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec
index 3f67b809b..1b85211a5 100644
--- a/redhat/dependencies/tqt3/tqt3.spec
+++ b/redhat/dependencies/tqt3/tqt3.spec
@@ -128,7 +128,7 @@ BuildRequires: cups-devel
 # LIBAUDIO support
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_nas 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver} >= 5000000
 %define libaudio_devel %{_lib}audio-devel nas-devel
 %else
 %define libaudio_devel nas-devel
@@ -260,20 +260,15 @@ BuildRequires: xorg-x11-proto-devel
 %endif
 
 # MESA support
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel}
 BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 %endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?pclinuxos}
-BuildRequires: MesaGLU-devel
-%else
-%if 0%{?mdkver}
-BuildRequires: %{_lib}glu-devel
-%else
-BuildRequires: mesaglu-devel
-%endif
+%if 0%{?mgaversion} || 0%{?pclinuxos}
+BuildRequires: %{_lib}mesaglu1-devel
 %endif
+%if 0%{?mdkver} >= 5000000
+BuildRequires: %{_lib}glu-devel
 %endif
 %if 0%{?suse_version}
 BuildRequires: Mesa-libGL-devel
diff --git a/redhat/dependencies/tqtinterface/tqtinterface.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec
index f36c916fb..c2f153c61 100644
--- a/redhat/dependencies/tqtinterface/tqtinterface.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface.spec
@@ -75,7 +75,7 @@ BuildRequires:	pkgconfig
 
 # PTHREAD support
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mgaversion} >= 7 || 0%{?mdkver}
+%if 0%{?mgaversion} >= 7 || 0%{?mdkversion}
 BuildRequires:	%{_lib}npth-devel
 %else
 BuildRequires:	pth-devel
@@ -92,16 +92,15 @@ BuildRequires:	libpth-devel
 %endif
 
 # MESA support
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel}
 BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 %endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver}
-BuildRequires: %{_lib}glu-devel
-%else
-BuildRequires: mesaglu-devel
+%if 0%{?mgaversion} || 0%{?pclinuxos}
+BuildRequires: %{_lib}mesaglu1-devel
 %endif
+%if 0%{?mdkver} >= 5000000
+BuildRequires: %{_lib}glu-devel
 %endif
 %if 0%{?suse_version}
 BuildRequires: Mesa-libGL-devel