Hello community,

here is the log from the commit of package qscintilla for openSUSE:Factory
checked in at Mon Sep 5 18:17:18 CEST 2011.



--------
--- KDE/qscintilla/python-qscintilla.changes    2010-09-01 10:57:36.000000000 
+0200
+++ qscintilla/python-qscintilla.changes        2011-08-29 20:43:16.000000000 
+0200
@@ -1,0 +2,11 @@
+Mon Aug 29 18:41:49 UTC 2011 - [email protected]
+
+- move sip files into separate package to avoid python 2/3 conflicts
+
+-------------------------------------------------------------------
+Mon Aug 15 01:42:37 UTC 2011 - [email protected]
+
+- update to 2.5.1:
+   - based on Scintilla v2.25
+
+-------------------------------------------------------------------
New Changes file:

--- /dev/null   2010-08-26 16:28:41.000000000 +0200
+++ qscintilla/python3-qscintilla.changes       2011-08-29 20:43:17.000000000 
+0200
@@ -0,0 +1,250 @@
+-------------------------------------------------------------------
+Mon Aug 29 18:42:23 UTC 2011 - [email protected]
+
+- move sip files into separate package to avoid python 2/3 conflicts
+
+-------------------------------------------------------------------
+Mon Aug 15 01:42:37 UTC 2011 - [email protected]
+
+- update to 2.5.1:
+
+- based on Scintilla v2.25
+
+-------------------------------------------------------------------
+* Mon Aug  8 2011 [email protected]
+
+- more python3 changes
+
+-------------------------------------------------------------------
+Sun Oct 17 2010 [email protected]
+
+- python 3 adjustments
+
+-------------------------------------------------------------------
+Tue Sep 21 2010 [email protected]
+
+- update to 2.4.5 release:
+  * Fixed a bug in QsciLexerVerilog that meant that the Keyword style was being
+    completely ignored.
+  * QsciStyle now auto-allocates style numbers from 63 rather than STYLE_MAX
+    because Scintilla only initially creates enough storage for that number of
+    styles.
+  * Fixed a regression, and the original bug, in 
QsciScintilla::clearAnnotations().
+  * Implemented QsciLexerHTML::autoCompletionFillups() to change the fillups to
+    "/>".
+  * The QsciScintillaBase.SendScintilla() Python overloads will now accept 
unicode
+    strings that can be encoded to UTF-8.
+  * The entries in user and auto-completion lists should now support UTF-8.
+  * Reverted the addition of the /Encoding/ annotations to SendScintilla() as 
it is
+    (probably) not the right solution.
+  * With Python v3, the QsciScintillaBase.SendScintilla() overloads that take
+    char * arguments now require them to be bytes objects and no longer allow 
them
+    to be str objects.
+
+-------------------------------------------------------------------
+Fri Jul 30 2010 [email protected]
+
+- update to 2.4.4 release:
+  * Pop-lists now get removed when the main widget loses focus.
+  * Changed SCN_MODIFIED to deal with text being NULL.
+  * The SCN_MODIFIED signal now tries to make sure that the text passed is 
valid.
+  * QsciScintilla::markerDefine() now allows existing markers to be redefined 
if an
+    explicit marker number is given.
+  * Fixed the drag and drop behaviour so that a move automatically turns into a
+    copy when the mouse leaves the widget.
+  * Fixed build problems against Qt v3.
+  * Added QsciScintillaBase::fromMimeData().
+  * Renamed QsciScintillaBase::createMimeData() to toMimeData().
+  * Added QsciScintillaBase::canInsertFromMimeData().
+  * Added QsciScintillaBase::createMimeData().
+
+-------------------------------------------------------------------
+Wed Apr 21 01:13:44 CEST 2010 - [email protected]
+
+- fix build
+
+-------------------------------------------------------------------
+Sun Apr 11 16:39:09 UTC 2010 - [email protected]
+
+- update to 2.4.3 release:
+  * Added clearFolds() to QsciScintilla.
+  * Updated Spanish translations from Jaime Seuma.
+  * Fixed compilation problems with Qt v3 and Qt v4 prior to v4.5.
+  * Added the QsciLexerSpice and QsciLexerVerilog classes.
+  * Significant performance improvements when handling long lines.
+  * The Python bindings include automatically generated docstrings 
+    by default.
+  * Added an API file for Python v3.
+
+-------------------------------------------------------------------
+Tue Nov  3 19:14:22 UTC 2009 - [email protected]
+
+- updated patches to apply with fuzz=0
+
+-------------------------------------------------------------------
+Fri Jul 10 14:51:54 CEST 2009 - [email protected]
+
+- update build requires after python-sip package split
+
+-------------------------------------------------------------------
+Mon Jun  8 09:57:09 CEST 2009 - [email protected]
+
+- update to 2.4 release:
+   * support for annotations, margin text
+   * ability to write new language lexers
+
+-------------------------------------------------------------------
+Tue May 26 20:52:48 CEST 2009 - [email protected]
+
+- update to 2.4-snapshot-20090525:
+  - Based on Scintilla v1.78.
+  - Added the QsciLexerCustom, QsciStyle and QsciStyledText classes.
+  - Added annotate(), annotation(), clearAnnotations(), setAnnotationDisplay()
+    and annotationDisplay() to QsciScintilla.
+  - Added setMarginText(), clearMarginText(), setMarginType() and marginType()
+    to QsciScintilla.
+  - Added QsciLexer::lexerId() so that container lexers can be implemented.
+  - Added editor() and styleBitsNeeded() to QsciLexer.
+  - Added setDollarsAllowed() and dollarsAllowed() to QsciLexerCPP.
+  - Added setFoldScriptComments(), foldScriptComments(),
+    setFoldScriptHeredocs() and foldScriptHeredocs() to QsciLexerHTML.
+  - Added setSmartHighlighting() and smartHighlighting() to QsciLexerPascal.
+    (Note that the Scintilla Pascal lexer has changed so that any saved colour
+    and font settings will not be properly restored.)
+  - Added setFoldPackages(), foldPackages(), setFoldPODBlocks() and
+    foldPODBlocks() to QsciLexerPerl.
+  - Added setV2UnicodeAllowed(), v2UnicodeAllowed(), setV3BinaryOctalAllowed(),
+    v3BinaryOctalAllowed(), setV3BytesAllowed and v3BytesAllowed() to
+    QsciLexerPython.
+  - Added setScriptsStyled() and scriptsStyled() to QsciLexerXML.
+  - Added Spanish translations from Jaime Seuma.
+ 
+-------------------------------------------------------------------
+Sat Dec  6 12:21:20 CET 2008 - [email protected]
+
+- update to 2.3.2:
+  Added the read() and write() methods to QsciScintilla in anticipation of PyQt
+  dropping support for QStrings.  This will allow file to be read and written
+  while keeping the number of conversions to the minimum.
+
+-------------------------------------------------------------------
+Wed Oct 22 16:55:45 CEST 2008 - [email protected]
+
+- debug_package_requires depend also on %release
+
+-------------------------------------------------------------------
+Fri Oct 10 08:09:21 CEST 2008 - [email protected]
+- update to 2.3 (bnc#432385):
+  * Licensing update: Dual licensed GPLv2/v3
+  * The new QsciAbstractAPIs class allows applications to replace the default
+    implementation of the language APIs used for auto-completion lists and call
+    tips.
+  * Added QsciScintilla::apiContext() to allow applications to determine the
+    context used for auto-completion and call tips.
+  * Added the QsciLexerFortran, QsciLexerFortran77, QsciLexerPascal,
+    QsciLexerPostScript, QsciLexerTCL, QsciLexerXML and QsciLexerYAML classes.
+  * QsciScintilla::setFolding() will now accept an optional margin number.
+  * A lexer's default colour, paper and font are now written to and read from
+    the settings.
+  * Windows64 is now supported.
+  * The signature of the QsciScintillaBase::SCN_MACRORECORD() signal has
+    changed slightly.
+
+-------------------------------------------------------------------
+Tue Sep  4 01:15:48 CEST 2007 - [email protected]
+
+- break buildcycle 
+
+-------------------------------------------------------------------
+Sat Aug 11 22:33:49 CEST 2007 - [email protected]
+
+- install Qt4 version of libraries
+- build python bindings
+- rename package to comply to Shared Library Policy
+
+-------------------------------------------------------------------
+Mon Aug  6 18:49:03 CEST 2007 - [email protected]
+
+- update to 1.73 (scintilla 2.1) (#297650)
+  * A revised API, incompatible with QScintilla v1.
+  * Hugely improved autocompletion and call tips support.
+  * Supports both Qt v3 and Qt v4.
+  * Includes Python bindings.
+
+-------------------------------------------------------------------
+Mon Jun  5 09:17:29 CEST 2006 - [email protected]
+
+- fix build for < 10.1
+
+-------------------------------------------------------------------
+Thu May 18 00:08:34 CEST 2006 - [email protected]
+
+- split into devel package (#165234) 
+
+-------------------------------------------------------------------
+Wed Jan 25 21:33:34 CET 2006 - [email protected]
+
+- converted neededforbuild to BuildRequires
+
+-------------------------------------------------------------------
+Mon Sep 19 20:01:54 CEST 2005 - [email protected]
+
+- update to version 1.6 (Scintilla 1.65 based)
+
+-------------------------------------------------------------------
+Wed Sep 29 17:58:42 CEST 2004 - [email protected]
+
+- update to version 1.4 (Scintilla 1.61 based); if I don't get
++++ 53 more lines (skipped)
++++ between /dev/null
++++ and qscintilla/python3-qscintilla.changes
--- KDE/qscintilla/qscintilla.changes   2010-09-01 10:57:36.000000000 +0200
+++ qscintilla/qscintilla.changes       2011-08-15 03:44:33.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Aug 15 01:40:43 UTC 2011 - [email protected]
+
+- update to 2.5.1:
+   - based on Scintilla v2.25
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  QScintilla-gpl-2.4.5.tar.bz2

New:
----
  QScintilla-gpl-2.5.1.tar.bz2
  python3-qscintilla.changes
  python3-qscintilla.spec

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-qscintilla.spec ++++++
--- /var/tmp/diff_new_pack.AhY4u1/_old  2011-09-05 18:16:38.000000000 +0200
+++ /var/tmp/diff_new_pack.AhY4u1/_new  2011-09-05 18:16:38.000000000 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package python-qscintilla (Version 2.4.5)
+# spec file for package python-qscintilla
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -28,7 +28,7 @@
 Group:          Development/Libraries/C and C++
 Summary:        Python  Bindings for the C++ Editor Class Library
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Version:        2.4.5
+Version:        2.5.1
 Release:        1
 %define scintilla_version %version
 Source:         QScintilla-gpl-%scintilla_version.tar.bz2
@@ -49,6 +49,17 @@
 --------
     Riverbank Computing Limited <[email protected]>
 
+
+%package sip
+Summary:        sip files for PyQScintilla
+License:        GPLv2+
+Group:          Development/Libraries/Python
+
+%description sip
+This package is needed to avoid conflicts between python-qscintilla and
+python3-qscintilla packages. It contains sip files  used to generate
+bindings to QScintilla
+
 %prep
 %setup -q -n QScintilla-gpl-%scintilla_version
 
@@ -70,7 +81,10 @@
 %defattr(-,root,root)
 %doc NEWS README LICENSE.GPL2 LICENSE.GPL3
 %py_sitedir/PyQt4/Qsci.so
-/usr/share/sip/PyQt4/Qsci
 /usr/share/qt4/qsci/api/python/QScintilla2.api
 
+%files sip
+%defattr(-,root,root)
+/usr/share/sip/PyQt4/Qsci
+
 %changelog

++++++ python3-qscintilla.spec ++++++
#
# spec file for package python3-qscintilla
#
# Copyright (c) 2011 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

# norootforbuild


Name:           python3-qscintilla
Url:            http://www.riverbankcomputing.co.uk/qscintilla
License:        GPLv2+
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:        1
%define scintilla_version %version
Source:         QScintilla-gpl-%scintilla_version.tar.bz2
Requires:       python3-qt4 >= %( echo `rpm -q --queryformat '%{VERSION}' 
python-qt4`)

BuildRequires:  -libqscintilla2-2 libqscintilla-devel
BuildRequires:  python3-devel
BuildRequires:  python3-qt4-devel python3-sip-devel

Requires:       python3 python3-base
Requires:       python3-sip
Requires:       libqt4-x11

%description
QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class.

This is a Qt port from the original Scintilla class
(http://www.scintilla.org/).

This package is mainly used by eric, the Python IDE.



Authors:
--------
    Riverbank Computing Limited <[email protected]>

%prep
%setup -q -n QScintilla-gpl-%scintilla_version

%build
pushd Python
python3 configure.py
make %{?_smp_mflags}
popd

%install
pushd Python
%makeinstall
rm -rf $RPM_BUILD_ROOT/usr/share/sip/PyQt4/Qsci
mv $RPM_BUILD_ROOT/usr/share/qt4/qsci/api/python 
$RPM_BUILD_ROOT/usr/share/qt4/qsci/api/python3
popd

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc NEWS README LICENSE.GPL2 LICENSE.GPL3
%{python3_sitearch}/PyQt4/Qsci.so
/usr/share/qt4/qsci/api/python3/QScintilla2.api

%changelog
++++++ qscintilla.spec ++++++
--- /var/tmp/diff_new_pack.AhY4u1/_old  2011-09-05 18:16:39.000000000 +0200
+++ /var/tmp/diff_new_pack.AhY4u1/_new  2011-09-05 18:16:39.000000000 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package qscintilla (Version 2.4.5)
+# spec file for package qscintilla
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -26,12 +26,12 @@
 Group:          Development/Libraries/C and C++
 Summary:        C++ Editor Class Library
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Version:        2.4.5
+Version:        2.5.1
 Release:        1
 %define scintilla_version %version
 Source:         QScintilla-gpl-%scintilla_version.tar.bz2
 Patch:          %name.diff
-%define debug_package_requires libqscintilla2-5 = %version-%release
+%define debug_package_requires libqscintilla2-6 = %version-%release
 
 %description
 QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class.
@@ -47,14 +47,15 @@
 --------
     Riverbank Computing Limited <[email protected]>
 
-%package -n libqscintilla2-5
+%package -n libqscintilla2-6
 License:        GPLv2+
 Group:          Development/Libraries/C and C++
 Summary:        C++ Editor Class Library
-Provides:       qscintilla = 1.73
-Obsoletes:      qscintilla <= 1.73
+Provides:       qscintilla = %{version}
+Obsoletes:      qscintilla <= %{version}
+Obsoletes:      libqscintilla2-5
 
-%description -n libqscintilla2-5
+%description -n libqscintilla2-6
 QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class.
 
 This is a Qt port from the original Scintilla class
@@ -72,7 +73,7 @@
 License:        GPLv2+
 Group:          Development/Libraries/C and C++
 Summary:        C++ Editor Class Library Development Files
-Requires:       libqscintilla2-5 = %{version}
+Requires:       libqscintilla2-6 = %{version}
 Requires:       qt3-devel >= %( echo `rpm -q --queryformat '%{VERSION}' 
qt3-devel`)
 Requires:       libqt4-devel >= %( echo `rpm -q --queryformat '%{VERSION}' 
libqt4-devel`)
 # openSUSE 10.3
@@ -121,22 +122,22 @@
 make INSTALL_ROOT=$RPM_BUILD_ROOT install
 popd
 
-%post -n libqscintilla2-5 -p /sbin/ldconfig
+%post -n libqscintilla2-6 -p /sbin/ldconfig
 
-%postun -n libqscintilla2-5 -p /sbin/ldconfig
+%postun -n libqscintilla2-6 -p /sbin/ldconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -n libqscintilla2-5
+%files -n libqscintilla2-6
 %defattr(-,root,root)
 %doc NEWS README LICENSE.GPL2 LICENSE.GPL3
-/usr/lib/qt3/%_lib/libqscintilla2.so.5*
+/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.5*
+%_libdir/libqscintilla2.so.6*
 
 %files -n libqscintilla-devel
 %defattr(-,root,root)

++++++ QScintilla-gpl-2.4.5.tar.bz2 -> QScintilla-gpl-2.5.1.tar.bz2 ++++++
++++ 228499 lines of diff (skipped)


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to