Hello community, here is the log from the commit of package qscintilla for openSUSE:Factory checked in at 2011-11-23 19:37:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qscintilla (Old) and /work/SRC/openSUSE:Factory/.qscintilla.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qscintilla", Maintainer is "kde-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/qscintilla/python3-qscintilla.changes 2011-09-23 12:43:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qscintilla.new/python3-qscintilla.changes 2011-11-23 19:37:47.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 22 23:50:59 UTC 2011 - cgiboudeaux@gmx.com + +- Define python3_sitearch for opensuse < 12.1 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/qscintilla/qscintilla.changes 2011-09-23 12:43:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qscintilla.new/qscintilla.changes 2011-11-23 19:37:47.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 23 06:35:52 UTC 2011 - termim@gmail.com + +- build QScintilla plugin for QT4 Designer + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-qscintilla.spec ++++++ --- /var/tmp/diff_new_pack.xRYDGQ/_old 2011-11-23 19:37:48.000000000 +0100 +++ /var/tmp/diff_new_pack.xRYDGQ/_new 2011-11-23 19:37:48.000000000 +0100 @@ -41,6 +41,8 @@ Requires: python3-sip Requires: libqt4-x11 +%global python3_sitearch %(python3 -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(True))" 2>/dev/null || echo PYTHON-NOT-FOUND) + %description QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class. ++++++ qscintilla.spec ++++++ --- /var/tmp/diff_new_pack.xRYDGQ/_old 2011-11-23 19:37:48.000000000 +0100 +++ /var/tmp/diff_new_pack.xRYDGQ/_new 2011-11-23 19:37:48.000000000 +0100 @@ -107,6 +107,10 @@ qmake make %{?jobs:-j %jobs} popd +pushd designer-Qt4 +qmake +make %{?jobs:-j %jobs} +popd %qt3_environment pushd Qt3 qmake -o Makefile qscintilla.pro @@ -117,6 +121,9 @@ pushd Qt4 make INSTALL_ROOT=$RPM_BUILD_ROOT install popd +pushd designer-Qt4 +make INSTALL_ROOT=$RPM_BUILD_ROOT install +popd %qt3_environment pushd Qt3 make INSTALL_ROOT=$RPM_BUILD_ROOT install @@ -146,5 +153,6 @@ /usr/lib/qt3/include/* /usr/lib/qt3/%_lib/libqscintilla2.so %_libdir/libqscintilla2.so +%_libdir/qt4/plugins/designer/libqscintillaplugin.so %changelog ++++++ qscintilla.diff ++++++ --- /var/tmp/diff_new_pack.xRYDGQ/_old 2011-11-23 19:37:48.000000000 +0100 +++ /var/tmp/diff_new_pack.xRYDGQ/_new 2011-11-23 19:37:48.000000000 +0100 @@ -24,3 +24,13 @@ INSTALLS += header trans qsci target +--- designer-Qt4/designer.pro.orig 2011-11-23 01:10:02.000000000 -0500 ++++ designer-Qt4/designer.pro 2011-11-23 01:11:58.000000000 -0500 +@@ -12,4 +12,5 @@ + target.path = $$[QT_INSTALL_PLUGINS]/designer + INSTALLS += target + +-LIBS += -lqscintilla2 ++LIBS += -L../Qt4 -lqscintilla2 ++INCLUDEPATH += ../Qt4 + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org