diff options
| -rw-r--r-- | qscintilla.spec | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/qscintilla.spec b/qscintilla.spec index c398473..87ddbc3 100644 --- a/qscintilla.spec +++ b/qscintilla.spec @@ -69,6 +69,7 @@ QMAKEFEATURES=`pwd`/Qt5/features; export QMAKEFEATURES pushd designer-Qt4Qt5 %{qmake_qt5} designer.pro INCLUDEPATH+=../Qt4Qt5 LIBS+=-L../Qt4Qt5 %make_build +popd pushd Python %{__python3} \ @@ -79,12 +80,13 @@ pushd Python cat Makefile cat Qsci/Makefile %make_build QMAKE_LFLAGS_RELEASE=%{_qt5_ldflags} QMAKE_CXXFLAGS_RELEASE=%{_qt5_cxxflags} +popd %install -make -C Qt5 install INSTALL_ROOT=%{buildroot} +make -C Qt4Qt5 install INSTALL_ROOT=%{buildroot} ln -s libqscintilla2_qt5.so %{buildroot}%{_qt5_libdir}/libqscintilla2-qt5.so -make -C designer-Qt5 install INSTALL_ROOT=%{buildroot} -make -C Python3-qt5 install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot} +make -C designer-Qt4Qt5 install INSTALL_ROOT=%{buildroot} +make -C Python install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot} test -x %{buildroot}%{python3_sitearch}/PyQt5/Qsci.so || \ chmod a+x %{buildroot}%{python3_sitearch}/PyQt5/Qsci.so @@ -115,6 +117,8 @@ grep "%{_qt5_translationdir}" qscintilla.lang > qscintilla-qt5.lang %changelog * Sun Jan 05 2025 Funda Wang <fundawang@yeah.net> - 2.11.6-1 - update to 2.11.6 +- drop redunctant conditions regarding qt5 and python3, as we only provide + single flavour for now * Fri Feb 18 2022 liwu <liwu13@huawei.com> - 2.11.2-2 - Fix build error of qscintilla |