summaryrefslogtreecommitdiffstats
path: root/redhat/dependencies/tqtinterface/tqtinterface.spec
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/dependencies/tqtinterface/tqtinterface.spec')
-rw-r--r--redhat/dependencies/tqtinterface/tqtinterface.spec29
1 files changed, 12 insertions, 17 deletions
diff --git a/redhat/dependencies/tqtinterface/tqtinterface.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec
index 475aeac18..7c2bac258 100644
--- a/redhat/dependencies/tqtinterface/tqtinterface.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
%endif
%define tde_pkg tqtinterface
@@ -62,18 +62,20 @@ BuildRequires: gcc-c++
BuildRequires: pkgconfig
# UUID support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
%define uuid_devel libuuid-devel
%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define uuid_devel %{_lib}uuid-devel
+%endif
%if 0%{?rhel} == 5
%define uuid_devel e2fsprogs-devel
%endif
%{?uuid_devel:BuildRequires: %{uuid_devel}}
-
# PTHREAD support
%if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mgaversion} >= 7
+%if 0%{?mgaversion} >= 7 || 0%{?mdkver}
BuildRequires: %{_lib}npth-devel
%else
BuildRequires: pth-devel
@@ -95,8 +97,12 @@ BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
+%if "%{?distribution}" == "OpenMandriva Lx"
+BuildRequires: %{_lib}glu-devel
+%else
BuildRequires: mesaglu-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
@@ -107,7 +113,7 @@ BuildRequires: Mesa-libGLU-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
@@ -181,18 +187,7 @@ although some code has been added for useful functions that are no longer part o
%files -n %{libtqt4}-devel
%defattr(-,root,root,-)
-%{_bindir}/convert_qt_tqt1
-%{_bindir}/convert_qt_tqt2
-%{_bindir}/convert_qt_tqt3
-%{_bindir}/dcopidl-tqt
-%{_bindir}/dcopidl2cpp-tqt
-%{_bindir}/dcopidlng-tqt
-%{_bindir}/mcopidl-tqt
-%{_bindir}/moc-tqt
%{_bindir}/tmoc
-%{_bindir}/tqt-replace
-%{_bindir}/tqt-replace-stream
-%{_bindir}/uic-tqt
%{_includedir}/tqt/
%{_libdir}/libtqt.la
%{_libdir}/libtqt.so
@@ -214,7 +209,7 @@ although some code has been added for useful functions that are no longer part o
%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