RPM: update packages for Fedora 29

1 files changed, 7 insertions, 2 deletions

diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
index b9d293309..272b099d5 100644
--- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
+++ b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
@@ -161,11 +161,12 @@ chmod -x example/*
   -e "s|^header.path = .*|header.path = %{_includedir}/tqt3|" \
   -e "s|^trans.path = .*|trans.path = %{_datadir}/tqt3/translations|"
 
+#  -e "s|\$(QTDIR)|%{_libdir}/tqt3|" \
 %__sed -i "designer/designer.pro" \
-  -e "s|\$(QTDIR)|%{_libdir}/tqt3|" \
   -e "s|# DESTDIR|DESTDIR|"
 
 export QTDIR=%{_libdir}/tqt3
+export TQTDIR=%{_prefix}
 ( cd qt; tqmake "DESTDIR=$PWD/../tmplib" )
 ( cd designer; tqmake )
 
@@ -179,6 +180,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %__sed -i "qt/Makefile" -e "s|..\/..\/..\/..\/..|%{_prefix}|g"
 %endif
 
+export QTDIR=%{_libdir}/tqt3
+export TQTDIR=%{_prefix}
 %__make %{?_smp_mflags} -C qt
 %__make %{?_smp_mflags} -C designer
 
@@ -186,6 +189,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %install
 unset QTDIR QTINC QTLIB
 export QTDIR=%{_libdir}/tqt3
+export TQTDIR=%{_prefix}
 %__rm -rf $RPM_BUILD_ROOT
 
 # Installs the QT part
@@ -202,7 +206,7 @@ for i in doc/html/*; do
 done
 
 # Installs the Designer plugin
-for i in designer/*.so ${QTDIR}/plugins/designer/*.so; do
+for i in designer/*.so ${QTDIR}/plugins/designer/*.so ${TQTDIR}/plugins/designer/*.so; do
   [ -r "${i}" ] || continue
   %__install -D -m 644 $i %{buildroot}${QTDIR}/plugins/designer/${i##*/}
 done
@@ -212,6 +216,7 @@ done
 %__mv -f tmplib/* %{buildroot}%{_libdir}
 
 # Fix private headers location
+%__mkdir_p %{buildroot}%{_includedir}
 %__mv -f %{buildroot}/private %{buildroot}%{_includedir}/tqt3
 %__mv -f %{buildroot}%{_includedir}/tqt3 %{buildroot}%{_includedir}/tqscintilla