RPM Packaging: update R14 packages

2 files changed, 19 insertions, 28 deletions

diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index ce2890a07..53333ef3c 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -256,15 +256,15 @@ applications, as well as the README files for TQt 3.
 %{tde_libdir}/libtqui.so.1
 %{tde_libdir}/libtqui.so.1.0
 %{tde_libdir}/libtqui.so.1.0.0
-%{tde_libdir}/libdesignercore.so.1
-%{tde_libdir}/libdesignercore.so.1.0
-%{tde_libdir}/libdesignercore.so.1.0.0
-%{tde_libdir}/libeditor.so.1
-%{tde_libdir}/libeditor.so.1.0
-%{tde_libdir}/libeditor.so.1.0.0
-%{tde_libdir}/libqassistantclient.so.1
-%{tde_libdir}/libqassistantclient.so.1.0
-%{tde_libdir}/libqassistantclient.so.1.0.0
+%{tde_libdir}/libtqtdesignercore.so.1
+%{tde_libdir}/libtqtdesignercore.so.1.0
+%{tde_libdir}/libtqtdesignercore.so.1.0.0
+%{tde_libdir}/libtqteditor.so.1
+%{tde_libdir}/libtqteditor.so.1.0
+%{tde_libdir}/libtqteditor.so.1.0.0
+%{tde_libdir}/libtqassistantclient.so.1
+%{tde_libdir}/libtqassistantclient.so.1.0
+%{tde_libdir}/libtqassistantclient.so.1.0.0
 
 ##########
 
@@ -326,12 +326,12 @@ toolkit.
 %{tde_datadir}/tqt3/mkspecs/
 %{tde_datadir}/tqt3/phrasebooks/
 %{tde_includedir}/tqt3/
-%{tde_libdir}/libdesignercore.prl
-%{tde_libdir}/libdesignercore.so
-%{tde_libdir}/libeditor.prl
-%{tde_libdir}/libeditor.so
-%{tde_libdir}/libqassistantclient.prl
-%{tde_libdir}/libqassistantclient.so
+%{tde_libdir}/libtqtdesignercore.prl
+%{tde_libdir}/libtqtdesignercore.so
+%{tde_libdir}/libtqteditor.prl
+%{tde_libdir}/libtqteditor.so
+%{tde_libdir}/libtqassistantclient.prl
+%{tde_libdir}/libtqassistantclient.so
 %{tde_libdir}/libtqt-mt.so
 %{tde_libdir}/libtqt-mt.prl
 %{tde_libdir}/libtqui.so
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index bfa90ad66..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,10 +112,12 @@ Development files for %{name}
 %debug_package
 %endif
 
+##########
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
+
 %build
 unset QTDIR QTINC QTLIB
 
@@ -145,7 +143,7 @@ fi
   -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 @@ fi
   -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