summaryrefslogtreecommitdiffstats
path: root/redhat/dependencies/avahi-tqt/avahi-tqt.spec
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/dependencies/avahi-tqt/avahi-tqt.spec')
-rw-r--r--redhat/dependencies/avahi-tqt/avahi-tqt.spec19
1 files changed, 14 insertions, 5 deletions
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt.spec b/redhat/dependencies/avahi-tqt/avahi-tqt.spec
index 3937f6ff3..94e0955f1 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -68,7 +68,7 @@ BuildRequires: gettext-devel
BuildRequires: xorg-x11-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: libxi-devel
+BuildRequires: %{_lib}xi-devel
%endif
%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
BuildRequires: libXi-devel
@@ -86,11 +86,15 @@ BuildRequires: dbus-devel
%endif
# PCAP support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}cap-devel
+%else
BuildRequires: libcap-devel
+%endif
# AVAHI support
%if 0%{?mgaversion} || 0%{?mdkversion}
-%define avahi_devel libavahi-client-devel
+%define avahi_devel %{_lib}avahi-client-devel
%endif
%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
%define avahi_devel avahi-devel
@@ -101,9 +105,12 @@ BuildRequires: libcap-devel
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: expat-devel
%endif
-%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?suse_version}
BuildRequires: libexpat-devel
%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}expat-devel
+%endif
# NAS support
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
@@ -210,7 +217,7 @@ into a TQt main loop application.
%build
unset QTDIR QTINC QTLIB
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
%__mkdir_p build
cd build
fi
@@ -222,6 +229,8 @@ fi
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DLIB_INSTALL_DIR="%{_libdir}" \
..
%__make %{?_smp_mflags} || %__make