RPM: many updates for upcoming R14.1.3

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

3 files changed, 12 insertions, 13 deletions

diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec
index 68bc75af8..357445ec7 100644
--- a/redhat/libraries/kipi-plugins/kipi-plugins.spec
+++ b/redhat/libraries/kipi-plugins/kipi-plugins.spec
@@ -140,20 +140,15 @@ BuildRequires:	libxslt-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/libraries/libtdeldap/libtdeldap.spec b/redhat/libraries/libtdeldap/libtdeldap.spec
index 80c14f13b..7949ac91e 100644
--- a/redhat/libraries/libtdeldap/libtdeldap.spec
+++ b/redhat/libraries/libtdeldap/libtdeldap.spec
@@ -78,7 +78,7 @@ BuildRequires:	libtool-ltdl-devel
 
 # SASL support
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
 BuildRequires:	%{_lib}sasl-devel
 %else
 BuildRequires:	%{_lib}sasl2-devel
@@ -90,7 +90,7 @@ BuildRequires:	cyrus-sasl-devel
 
 # OPENLDAP support
 %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 5000000
 BuildRequires:	lib64ldap-devel
 %else
 BuildRequires:	openldap-devel
@@ -115,7 +115,11 @@ BuildRequires:	libheimdal-devel
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
 %define with_tdehwlib 1
 %if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?pclinuxos}
+BuildRequires:	%{_lib}udev1-devel
+%else
 BuildRequires:	%{_lib}udev-devel
+%endif
 %else
 BuildRequires:	libudev-devel
 %endif
diff --git a/redhat/libraries/pytde/pytde.spec b/redhat/libraries/pytde/pytde.spec
index 23c576859..4968129fd 100644
--- a/redhat/libraries/pytde/pytde.spec
+++ b/redhat/libraries/pytde/pytde.spec
@@ -93,7 +93,7 @@ from tdeio, tdejs, tdehtml and tdeprint.
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{python_sitearch}/*.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}/dcopexport.py*
 %{python_sitearch}/dcopext.py*
 %{python_sitearch}/pytdeconfig.py*