2 files changed, 16 insertions, 22 deletions
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index 4624ccbe9..36d1d77b1 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -74,8 +74,6 @@ Trinity QT Interface
 %{tde_bindir}/tqt-replace
 %{tde_bindir}/tqt-replace-stream
 %{tde_bindir}/uic-tqt
-%{tde_libdir}/libtqassistantclient.so.4
-%{tde_libdir}/libtqassistantclient.so.4.2.0
 %{tde_libdir}/libtqt.so.4
 %{tde_libdir}/libtqt.so.4.2.0
 
@@ -102,8 +100,6 @@ Development files for %{name}
 %files devel
 %defattr(-,root,root,-)
 %{tde_includedir}/tqt/
-%{tde_libdir}/libtqassistantclient.la
-%{tde_libdir}/libtqassistantclient.so
 %{tde_libdir}/libtqt.la
 %{tde_libdir}/libtqt.so
 %{tde_libdir}/pkgconfig/tqt.pc
@@ -116,17 +112,19 @@ Development files for %{name}
 %debug_package
 %endif
 
+##########
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
+
 %build
 unset QTDIR QTINC QTLIB
 
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
 
 %cmake \
   -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
@@ -145,7 +143,7 @@ cd build
   -DINCLUDE_INSTALL_DIR=%{tde_includedir}/tqt \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   -DBIN_INSTALL_DIR=%{tde_bindir} \
-\
+  \
   -DCMAKE_LIBRARY_PATH="%{tde_libdir}" \
   -DCMAKE_INCLUDE_PATH="%{tde_includedir}" \
   \
@@ -154,20 +152,13 @@ cd build
   -DUSE_QT3="ON" \
   ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 %__rm -rf %{?buildroot}
 %__make install DESTDIR=%{?buildroot} -C build
 
-# RHEL 5: add newline at end of include files to avoid warnings
-%if 0%{?rhel} && 0%{?rhel} <= 5
-for i in %{?buildroot}%{tde_includedir}/tqt/*.h; do
-  echo "" >>${i}
-done
-%endif
-
 # Install 'cmake' modules for development use
 %__mkdir_p %{?buildroot}%{cmake_modules_dir}
 for i in cmake/modules/*.cmake; do
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
index a153b133b..25e2c0256 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
@@ -120,12 +120,15 @@ Development files for %{name}
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
 %build
-unset QTDIR; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt3.sh
 
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+pwd
 
 # Note: specifying 'QT_LIBRARY_DIR' allow using QT3 libraries under
 #  another directory than QT3_PREFIX. (E.g. Mageia 2, Mandriva ...)