diff options
| author | François Andriot <albator78@libertysurf.fr> | 2019-01-01 23:01:58 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2019-01-01 23:01:58 +0100 |
| commit | 2423883a54867dcbbc6056f017361f212a37d100 (patch) | |
| tree | b6d6621ba9747078ddcac811dbd8f3752d6e81bc | |
| parent | 655ebdf18d1046473d2ae2c7e3cfc4ced71339f6 (diff) | |
| download | tde-packaging-2423883a54867dcbbc6056f017361f212a37d100.tar.gz tde-packaging-2423883a54867dcbbc6056f017361f212a37d100.zip | |
RPM: fix kxmleditor, qalculate-tde, tde-style-baghira, tqscintilla on r14.0.x
4 files changed, 11 insertions, 1 deletions
diff --git a/redhat/applications/kxmleditor/kxmleditor.spec b/redhat/applications/kxmleditor/kxmleditor.spec index cf0447a98..c09858848 100644 --- a/redhat/applications/kxmleditor/kxmleditor.spec +++ b/redhat/applications/kxmleditor/kxmleditor.spec @@ -98,6 +98,9 @@ contents. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +# Fix build on r14.0.x +%__sed -i *"/Makefile.am" -e "s|\$(LIB_TQT)|-ltqt-mt|" + %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec index 365e96bd8..bd98db971 100644 --- a/redhat/applications/qalculate-tde/qalculate-tde.spec +++ b/redhat/applications/qalculate-tde/qalculate-tde.spec @@ -106,6 +106,9 @@ This package contains the TDE user interface of qalculate. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +# Fix build on r14.0.x +%__sed -i *"/Makefile.am" -e "s|\$(LIB_TQT)|-ltqt-mt|" + %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/applications/tde-style-baghira/tde-style-baghira.spec b/redhat/applications/tde-style-baghira/tde-style-baghira.spec index 99325e85b..652bb3993 100644 --- a/redhat/applications/tde-style-baghira/tde-style-baghira.spec +++ b/redhat/applications/tde-style-baghira/tde-style-baghira.spec @@ -88,6 +88,10 @@ Panther and Jaguar looks, and also includes its own 'Baghira' look %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +# Fix build on r14.0.x +%__sed -i *"/Makefile.am" -e "s|\$(LIB_TQT)|-ltqt-mt|" +%__sed -i "configure.in.in" -e "/^KDE_USE_TQT/d" + %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec index 272b099d5..2d5616cd9 100644 --- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec +++ b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec @@ -161,8 +161,8 @@ 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 |