1 files changed, 42 insertions, 35 deletions

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 03bc7e825..42c73bff1 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -15,11 +15,15 @@
 # Please submit bugfixes or comments via http:/www.trinitydesktop.org/
 #
 
-# TDE specific building variables
+# TDE variables
 %define tde_version 14.0.0
-%define tde_prefix /opt/trinity
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
+
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define libavahi %{_lib}avahi
+%else
+%define libavahi libavahi
+%endif
+
 
 Name:		trinity-avahi-tqt
 Epoch:		2
@@ -43,8 +47,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	libtqt3-mt-devel >= 3.5.0
-BuildRequires:	libtqt4-devel >= 1:4.2.0
+BuildRequires:	libtqt4-devel >= 2:4.2.0
 
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
@@ -53,9 +56,6 @@ BuildRequires:	libtool
 # GETTEXT support
 BuildRequires:	gettext-devel
 
-# GLIB2 support
-BuildRequires:	glib2-devel
-
 # DBUS support
 %if 0%{?suse_version}
 BuildRequires:	dbus-1-devel
@@ -64,7 +64,7 @@ BuildRequires:	dbus-1-devel
 BuildRequires:	dbus-devel
 %endif
 
-# AVAHI support
+# AVAHI support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}avahi-client-devel
 %endif
@@ -72,7 +72,7 @@ BuildRequires:	%{_lib}avahi-client-devel
 BuildRequires:	avahi-devel
 %endif
 
-# EXPAT support
+# EXPAT support
 %if 0%{?rhel} || 0%{?fedora}
 BuildRequires:	expat-devel
 %endif
@@ -80,12 +80,15 @@ BuildRequires:	expat-devel
 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 +103,15 @@ into a TQt main loop application.
 
 ##########
 
-%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 +121,39 @@ print to, files to look at and people to talk to.
 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}-tqt-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-tqt-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 >= 2: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}-tqt-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 +163,13 @@ print to, files to look at and people to talk to.
 This library contains the interface to integrate the Avahi libraries
 into a TQt main loop application.
 
-%post -n libavahi-tqt-devel
+%post -n %{libavahi}-tqt-devel
 /sbin/ldconfig || :
 
-%postun -n libavahi-tqt-devel
+%postun -n %{libavahi}-tqt-devel
 /sbin/ldconfig || :
 
-%files -n libavahi-tqt-devel
+%files -n %{libavahi}-tqt-devel
 %defattr(-,root,root,-)
 %{_includedir}/avahi-tqt/
 %{_libdir}/libavahi-tqt.so