commit qscintilla for openSUSE:Factory
Hello community, here is the log from the commit of package qscintilla for openSUSE:Factory checked in at Wed Nov 4 11:18:04 CET 2009. -------- --- KDE/qscintilla/python-qscintilla.changes 2009-07-10 14:52:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/qscintilla/python-qscintilla.changes 2009-11-03 20:22:10.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 3 19:14:22 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- qscintilla.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qscintilla.spec ++++++ --- /var/tmp/diff_new_pack.SZbF85/_old 2009-11-04 11:17:36.000000000 +0100 +++ /var/tmp/diff_new_pack.SZbF85/_new 2009-11-04 11:17:36.000000000 +0100 @@ -29,7 +29,7 @@ Summary: Python Bindings for the C++ Editor Class Library BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 2.4 -Release: 2 +Release: 3 %define scintilla_version 2.4 Source: QScintilla-gpl-%scintilla_version.tar.bz2 Requires: python-qt4 >= %( echo `rpm -q --queryformat '%{VERSION}' python-qt4`) ++++++ qscintilla.spec ++++++ --- /var/tmp/diff_new_pack.SZbF85/_old 2009-11-04 11:17:36.000000000 +0100 +++ /var/tmp/diff_new_pack.SZbF85/_new 2009-11-04 11:17:36.000000000 +0100 @@ -27,7 +27,7 @@ Summary: C++ Editor Class Library BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 2.4 -Release: 2 +Release: 3 %define scintilla_version 2.4 Source: QScintilla-gpl-%scintilla_version.tar.bz2 Patch: %name.diff ++++++ qscintilla.diff ++++++ --- /var/tmp/diff_new_pack.SZbF85/_old 2009-11-04 11:17:36.000000000 +0100 +++ /var/tmp/diff_new_pack.SZbF85/_new 2009-11-04 11:17:36.000000000 +0100 @@ -1,6 +1,17 @@ ---- Qt3/qscintilla.pro +Index: Qt3/qscintilla.pro +=================================================================== +--- Qt3/qscintilla.pro.orig +++ Qt3/qscintilla.pro -@@ -41,11 +41,8 @@ isEmpty(trans.path) { +@@ -45,7 +45,7 @@ DEFINES = QSCINTILLA_MAKE_DLL QT SCI_LEX + # Handle both Qt v4 and v3. + target.path = $$[QT_INSTALL_LIBS] + isEmpty(target.path) { +- target.path = $(QTDIR)/lib ++ target.path = $(QTDIR_LIB) + } + + header.path = $$[QT_INSTALL_HEADERS] +@@ -61,11 +61,8 @@ isEmpty(trans.path) { trans.path = $(QTDIR)/translations } @@ -11,16 +22,5 @@ -} +qsci.path = $(QTDIR) - target.path = $$[QT_INSTALL_LIBS] - isEmpty(target.path) { ---- Qt3/qscintilla.pro -+++ Qt3/qscintilla.pro -@@ -45,7 +45,7 @@ DEFINES = QSCINTILLA_MAKE_DLL QT SCI_LEXER - # Handle both Qt v4 and v3. - target.path = $$[QT_INSTALL_LIBS] - isEmpty(target.path) { -- target.path = $(QTDIR)/lib -+ target.path = $(QTDIR_LIB) - } + INSTALLS += header trans qsci target - header.path = $$[QT_INSTALL_HEADERS] ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de