1 files changed, 40 insertions, 30 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 41d6c5f7f..1989ceb7b 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package avahi-tqt (version R14.0.0)
+# spec file for package avahi-tqt (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -12,12 +12,14 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # TDE variables
 %define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
 %define libavahi %{_lib}avahi
@@ -29,7 +31,7 @@
 Name:		trinity-avahi-tqt
 Epoch:		%{tde_epoch}
 Version:	0.6.30
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	Avahi TQt integration library
 Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
@@ -50,13 +52,31 @@ Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
 
+# GLIB2 support
+BuildRequires:	glib2-devel
+
 # GETTEXT support
 BuildRequires:	gettext-devel
 
+# Xi support
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	libxi-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
+
 # DBUS support
 %if 0%{?suse_version}
 BuildRequires:	dbus-1-devel
@@ -70,7 +90,7 @@ BuildRequires:	libcap-devel
 
 # AVAHI support
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%define avahi_devel %{_lib}avahi-client-devel
+%define avahi_devel libavahi-client-devel
 %endif
 %if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
 %define avahi_devel avahi-devel
@@ -170,6 +190,7 @@ into a TQt main loop application.
 %files -n %{libavahi}-tqt-devel
 %defattr(-,root,root,-)
 %{_includedir}/avahi-tqt/
+%{_libdir}/libavahi-tqt.a
 %{_libdir}/libavahi-tqt.so
 %{_libdir}/libavahi-tqt.la
 %{_libdir}/pkgconfig/avahi-tqt.pc
@@ -184,40 +205,31 @@ into a TQt main loop application.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-export NOCONFIGURE=1
-./autogen.sh
 
 
 %build
 unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --exec-prefix=%{_prefix} \
-  --includedir=%{_includedir} \
-  --libdir=%{_libdir} \
-  \
-  --disable-static \
-  --disable-dependency-tracking \
-  \
-  --enable-compat-libdns_sd \
-  --with-systemdsystemunitdir=/lib/systemd/system \
-%if 0%{?suse_version}
-  --with-distro=suse \
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-  --with-distro=fedora \
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-  --with-distro=mandriva \
-%endif
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  ..
 
 %__make %{?_smp_mflags} || %__make
 
 
 %install
 %__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
+%__make install DESTDIR="%{?buildroot}" -C build
 
 
 %clean
@@ -225,5 +237,3 @@ export PATH="%{tde_bindir}:${PATH}"
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.6.30-1
-- Initial release for TDE 14.0.0