summaryrefslogtreecommitdiffstats
path: root/redhat/dependencies/tqscintilla
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2018-11-29 21:39:23 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2018-11-29 21:43:15 +0100
commitd84ac84ba0aa91b3eca32f536a4c48ce5fc97315 (patch)
treeb57f6bafd5d2e9baeeb3566edce24adde692e33b /redhat/dependencies/tqscintilla
parent87408b080b2d3c9c3382365f9f42bc3f34304a89 (diff)
downloadtde-packaging-d84ac84ba0aa91b3eca32f536a4c48ce5fc97315.tar.gz
tde-packaging-d84ac84ba0aa91b3eca32f536a4c48ce5fc97315.zip
RPM: update packages for Fedora 29
Diffstat (limited to 'redhat/dependencies/tqscintilla')
-rw-r--r--redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec9
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