RPM Packaging: update dependencies

diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
index 03bc7e8..57e8c27 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -21,6 +21,13 @@
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 
+%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%define libavahi %{_lib}avahi
+%else
+%define libavahi libavahi
+%endif
+
+
 Name:		trinity-avahi-tqt
 Epoch:		2
 Version:	0.6.30
@@ -43,7 +50,6 @@
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	libtqt3-mt-devel >= 3.5.0
 BuildRequires:	libtqt4-devel >= 1:4.2.0
 
 BuildRequires:	gcc-c++
@@ -53,9 +59,6 @@
 # GETTEXT support
 BuildRequires:	gettext-devel
 
-# GLIB2 support
-BuildRequires:	glib2-devel
-
 # DBUS support
 %if 0%{?suse_version}
 BuildRequires:	dbus-1-devel
@@ -64,7 +67,7 @@
 BuildRequires:	dbus-devel
 %endif
 
-#��AVAHI support
+# AVAHI support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}avahi-client-devel
 %endif
@@ -72,7 +75,7 @@
 BuildRequires:	avahi-devel
 %endif
 
-#��EXPAT support
+# EXPAT support
 %if 0%{?rhel} || 0%{?fedora}
 BuildRequires:	expat-devel
 %endif
@@ -80,12 +83,15 @@
 BuildRequires:	libexpat-devel
 %endif
 
-# UUID support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6
-BuildRequires: libuuid-devel
+# NAS support
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_nas 1
+BuildRequires: nas-devel
 %endif
-%if 0%{?rhel} == 5
-BuildRequires: e2fsprogs-devel
+
+# XT support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires: libXt-devel
 %endif
 
 %description
@@ -100,18 +106,15 @@
 
 ##########
 
-%package -n libavahi-tqt
+%package -n %{libavahi}-tqt1
 Summary:	Avahi TQt integration library
 Group:		System/Libraries
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides:		%{_lib}avahi-qt3
-%endif
+Provides:	libavahi-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Obsoletes:		trinity-avahi-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:		trinity-avahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n libavahi-tqt
+%description -n %{libavahi}-tqt1
 Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
 It allows programs to publish and discover services and hosts
 running on a local network with no specific configuration. For
@@ -121,32 +124,39 @@
 This library contains the interface to integrate the Avahi libraries
 into a TQt main loop application.
 
-%post -n libavahi-tqt
+%post -n %{libavahi}-tqt1
 /sbin/ldconfig || :
 
-%postun -n libavahi-tqt
+%postun -n %{libavahi}-tqt1
 /sbin/ldconfig || :
 
-%files -n libavahi-tqt
+%files -n %{libavahi}-tqt1
 %defattr(-,root,root,-)
 %{_libdir}/libavahi-tqt.so.1
 %{_libdir}/libavahi-tqt.so.1.0.0
 
 ##########
 
-%package -n libavahi-tqt-devel
+%package -n %{libavahi}-tqt1-devel
 Summary:	Avahi TQt integration library (Development Files)
-Group:		Development/Libraries
-Requires:	libavahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Group:		Development/Libraries/C and C++
+Provides:	libavahi-tqt1-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides:		%{_lib}avahi-qt3-devel
-%endif
+Requires:	%{libavahi}-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	libtqt4-devel >= 1:4.2.0
 
 Obsoletes:		trinity-avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:		trinity-avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n libavahi-tqt-devel
+# AVAHI support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Requires:	%{_lib}avahi-client-devel
+%endif
+%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
+Requires:	avahi-devel
+%endif
+
+%description -n %{libavahi}-tqt1-devel
 Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
 It allows programs to publish and discover services and hosts
 running on a local network with no specific configuration. For
@@ -156,13 +166,13 @@
 This library contains the interface to integrate the Avahi libraries
 into a TQt main loop application.
 
-%post -n libavahi-tqt-devel
+%post -n %{libavahi}-tqt1-devel
 /sbin/ldconfig || :
 
-%postun -n libavahi-tqt-devel
+%postun -n %{libavahi}-tqt1-devel
 /sbin/ldconfig || :
 
-%files -n libavahi-tqt-devel
+%files -n %{libavahi}-tqt1-devel
 %defattr(-,root,root,-)
 %{_includedir}/avahi-tqt/
 %{_libdir}/libavahi-tqt.so
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 4d6db19..ea62b89 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -18,6 +18,12 @@
 # TDE specific variables
 %define tde_version 14.0.0
 
+%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%define libtqt3 %{_lib}tqt3
+%else
+%define libtqt3 libtqt3
+%endif
+
 
 Name:		trinity-tqt3
 Version:	3.5.0
@@ -170,11 +176,17 @@
 %endif
 
 # XI support
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires: libXi-devel
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-devel
 %endif
-%if 0%{?mgaversion}
-BuildRequires: %{_lib}xi-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}xi-devel
+%endif
+%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
+BuildRequires:	libXi-devel
+%endif
+%if 0%{?suse_version} == 1140
+BuildRequires:	libXi6-devel
 %endif
 
 # Xorg support
@@ -232,9 +244,10 @@
 
 ##########
 
-%package -n libtqt3-mt
+%package -n %{libtqt3}-mt
 Summary:	TQt GUI Library (Threaded runtime version), Version 3
 Group:		System/GUI/Other
+Provides:	libtqt3-mt = %{version}-%{release}
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -242,18 +255,18 @@
 Requires: fontconfig >= 2.0
 Requires: /etc/ld.so.conf.d
 
-%description -n libtqt3-mt
+%description -n %{libtqt3}-mt
 This is the Trolltech TQt library, version 3. It's necessary for
 applications that link against the libtqt-mt.so.3, e.g. all Trinity
 applications.
 
-%post -n libtqt3-mt
+%post -n %{libtqt3}-mt
 /sbin/ldconfig || :
 
-%postun -n libtqt3-mt
+%postun -n %{libtqt3}-mt
 /sbin/ldconfig || :
 
-%files -n libtqt3-mt
+%files -n %{libtqt3}-mt
 %defattr(-,root,root,-)
 %doc FAQ LICENSE* README* changes*
 %dir %{_libdir}/tqt3/
@@ -281,10 +294,11 @@
 
 ###########
 
-%package -n libtqt3-mt-devel
+%package -n %{libtqt3}-mt-devel
 Summary:	TQt development files (Threaded)
 Group:		Development/Libraries/X11
-Requires:	libtqt3-mt = %{version}-%{release}
+Provides:	libtqt3-mt-devel = %{version}-%{release}
+Requires:	%{libtqt3}-mt = %{version}-%{release}
 
 ** Diff limit reached (max: 250 lines) **