Hello community, here is the log from the commit of package qscintilla for openSUSE:Factory checked in at 2012-02-16 10:09:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qscintilla (Old) and /work/SRC/openSUSE:Factory/.qscintilla.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qscintilla", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/qscintilla/python-qscintilla.changes 2011-09-23 12:43:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qscintilla.new/python-qscintilla.changes 2012-02-16 10:09:23.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Feb 5 00:37:41 UTC 2012 - ter...@gmail.com + +- update to 2.6: + - based on Scintilla v2.29. + - improved support for rebinding keys to commands + - native key bindings under OS/X. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/qscintilla/python3-qscintilla.changes 2011-11-23 19:37:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qscintilla.new/python3-qscintilla.changes 2012-02-16 10:09:23.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Feb 5 00:38:16 UTC 2012 - ter...@gmail.com + +- update to 2.6: + - based on Scintilla v2.29. + - improved support for rebinding keys to commands + - native key bindings under OS/X. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/qscintilla/qscintilla.changes 2011-11-23 19:37:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qscintilla.new/qscintilla.changes 2012-02-16 10:09:23.000000000 +0100 @@ -1,0 +2,9 @@ +Sun Feb 5 00:35:40 UTC 2012 - ter...@gmail.com + +- update to 2.6: + - based on Scintilla v2.29. + - improved support for rebinding keys to commands + - native key bindings under OS/X. +- remove Qt3 support (it does not compile with current Qt3 packages) + +------------------------------------------------------------------- Old: ---- QScintilla-gpl-2.5.1.tar.bz2 New: ---- QScintilla-gpl-2.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qscintilla.spec ++++++ --- /var/tmp/diff_new_pack.YM9uPW/_old 2012-02-16 10:09:25.000000000 +0100 +++ /var/tmp/diff_new_pack.YM9uPW/_new 2012-02-16 10:09:25.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-qscintilla # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,17 +19,15 @@ Name: python-qscintilla -BuildRequires: -libqscintilla2-2 libqscintilla-devel python-devel -%if %suse_version > 1000 +BuildRequires: libqscintilla-devel libqscintilla2-8 python-devel BuildRequires: libdrm-devel python-qt4-devel python-sip-devel -%endif Url: http://www.riverbankcomputing.co.uk/qscintilla License: GPL-2.0+ Group: Development/Libraries/C and C++ Summary: Python Bindings for the C++ Editor Class Library BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 2.5.1 -Release: 3 +Version: 2.6 +Release: 1 %define scintilla_version %version Source: QScintilla-gpl-%scintilla_version.tar.bz2 Requires: python-qt4 >= %( echo `rpm -q --queryformat '%{VERSION}' python-qt4`) ++++++ python3-qscintilla.spec ++++++ --- /var/tmp/diff_new_pack.YM9uPW/_old 2012-02-16 10:09:25.000000000 +0100 +++ /var/tmp/diff_new_pack.YM9uPW/_new 2012-02-16 10:09:25.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3-qscintilla # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,13 +24,13 @@ Group: Development/Libraries/C and C++ Summary: Python 3 Bindings for the C++ Editor Class Library BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 2.5.1 -Release: 3 +Version: 2.6 +Release: 1 %define scintilla_version %version Source: QScintilla-gpl-%scintilla_version.tar.bz2 Requires: python3-qt4 >= %( echo `rpm -q --queryformat '%{VERSION}' python3-qt4`) -BuildRequires: -libqscintilla2-2 libqscintilla-devel +BuildRequires: libqscintilla-devel libqscintilla2-8 BuildRequires: python3-devel BuildRequires: python3-qt4-devel python3-sip-devel ++++++ qscintilla.spec ++++++ --- /var/tmp/diff_new_pack.YM9uPW/_old 2012-02-16 10:09:25.000000000 +0100 +++ /var/tmp/diff_new_pack.YM9uPW/_new 2012-02-16 10:09:25.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package qscintilla # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,19 +19,18 @@ Name: qscintilla -BuildRequires: libjpeg-devel qt3-devel-tools BuildRequires: libdrm-devel libqt4-devel Url: http://www.riverbankcomputing.co.uk/qscintilla License: GPL-2.0+ Group: Development/Libraries/C and C++ Summary: C++ Editor Class Library BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 2.5.1 -Release: 5 +Version: 2.6 +Release: 1 %define scintilla_version %version Source: QScintilla-gpl-%scintilla_version.tar.bz2 Patch: %name.diff -%define debug_package_requires libqscintilla2-6 = %version-%release +%define debug_package_requires libqscintilla2-8 = %version-%release %description QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class. @@ -47,15 +46,13 @@ -------- Riverbank Computing Limited <i...@riverbankcomputing.co.uk> -%package -n libqscintilla2-6 +%package -n libqscintilla2-8 License: GPL-2.0+ Group: Development/Libraries/C and C++ Summary: C++ Editor Class Library Provides: qscintilla = %{version} -Obsoletes: qscintilla <= %{version} -Obsoletes: libqscintilla2-5 -%description -n libqscintilla2-6 +%description -n libqscintilla2-8 QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class. This is a Qt port from the original Scintilla class @@ -73,8 +70,7 @@ License: GPL-2.0+ Group: Development/Libraries/C and C++ Summary: C++ Editor Class Library Development Files -Requires: libqscintilla2-6 = %{version} -Requires: qt3-devel >= %( echo `rpm -q --queryformat '%{VERSION}' qt3-devel`) +Requires: libqscintilla2-8 = %{version} Requires: libqt4-devel >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-devel`) # openSUSE 10.3 Provides: qscintilla-devel = %{version} @@ -99,10 +95,6 @@ %patch %build -%define qt3_environment \ - export QTDIR=/usr/lib/qt3/ \ - export QTDIR_LIB=$QTDIR/%_lib \ - export PATH=$QTDIR/bin/:$PATH pushd Qt4 qmake make %{?jobs:-j %jobs} @@ -111,11 +103,6 @@ qmake make %{?jobs:-j %jobs} popd -%qt3_environment -pushd Qt3 -qmake -o Makefile qscintilla.pro -make %{?jobs:-j %jobs} -popd %install pushd Qt4 @@ -124,34 +111,25 @@ pushd designer-Qt4 make INSTALL_ROOT=$RPM_BUILD_ROOT install popd -%qt3_environment -pushd Qt3 -make INSTALL_ROOT=$RPM_BUILD_ROOT install -popd -%post -n libqscintilla2-6 -p /sbin/ldconfig +%post -n libqscintilla2-8 -p /sbin/ldconfig -%postun -n libqscintilla2-6 -p /sbin/ldconfig +%postun -n libqscintilla2-8 -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT -%files -n libqscintilla2-6 +%files -n libqscintilla2-8 %defattr(-,root,root) %doc NEWS README LICENSE.GPL2 LICENSE.GPL3 -/usr/lib/qt3/%_lib/libqscintilla2.so.6* -/usr/lib/qt3/translations/qscintilla_*.qm -/usr/lib/qt3/qsci /usr/share/qt4/qsci /usr/share/qt4/translations/qscintilla_*.qm -%_libdir/libqscintilla2.so.6* +%_libdir/libqscintilla2.so.8* %files -n libqscintilla-devel %defattr(-,root,root) -%doc doc/html-Qt3 /usr/include/Qsci -/usr/lib/qt3/include/* -/usr/lib/qt3/%_lib/libqscintilla2.so +/usr/include/Qsci/* %_libdir/libqscintilla2.so %_libdir/qt4/plugins/designer/libqscintillaplugin.so ++++++ QScintilla-gpl-2.5.1.tar.bz2 -> QScintilla-gpl-2.6.tar.bz2 ++++++ ++++ 151283 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
