Hello community,
here is the log from the commit of package qscintilla-qt5 for openSUSE:Factory
checked in at 2018-10-23 20:38:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qscintilla-qt5 (Old)
and /work/SRC/openSUSE:Factory/.qscintilla-qt5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qscintilla-qt5"
Tue Oct 23 20:38:36 2018 rev:6 rq:643697 version:2.10.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/qscintilla-qt5/python-qscintilla-qt4.changes
2018-04-19 15:30:40.524136121 +0200
+++
/work/SRC/openSUSE:Factory/.qscintilla-qt5.new/python-qscintilla-qt4.changes
2018-10-23 20:38:40.192667632 +0200
@@ -1,0 +2,16 @@
+Sun Oct 21 14:09:20 UTC 2018 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Update to 2.10.8:
+ * Refactored the accessibility support
+
+-------------------------------------------------------------------
+Mon Jul 2 16:15:06 UTC 2018 - christo...@krop.fr
+
+- Update to 2.10.7:
+ * Added the QsciLexerEDIFACT class.
+ * Added setStyle() to QsciStyle.
+ * Control-wheel scroll will now zoom in and out of the document.
+ * Buffered drawing is now disabled by default.
+- Refresh patches
+
+-------------------------------------------------------------------
python-qscintilla-qt5.changes: same change
qscintilla-qt4.changes: same change
qscintilla-qt5.changes: same change
Old:
----
QScintilla_gpl-2.10.4.tar.gz
New:
----
QScintilla_gpl-2.10.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-qscintilla-qt4.spec ++++++
--- /var/tmp/diff_new_pack.DTGkvD/_old 2018-10-23 20:38:41.620665926 +0200
+++ /var/tmp/diff_new_pack.DTGkvD/_new 2018-10-23 20:38:41.624665921 +0200
@@ -12,19 +12,19 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define oldpython python
Name: python-qscintilla-qt4
-Version: 2.10.4
+Version: 2.10.8
Release: 0
Summary: Python Bindings for the C++ Editor Class Library
License: GPL-3.0-only
Group: Development/Libraries/C and C++
-Url: http://www.riverbankcomputing.co.uk/qscintilla
+URL: http://www.riverbankcomputing.co.uk/qscintilla
Source: QScintilla_gpl-%{version}.tar.gz
BuildRequires: %{python_module devel}
BuildRequires: %{python_module qt4-devel}
@@ -32,10 +32,10 @@
BuildRequires: libdrm-devel
BuildRequires: libqscintilla_qt4-devel
BuildRequires: python-rpm-macros
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-sip = %{version}
-%requires_ge python-qt4
Requires: python-sip(api) = %{python_sip_api_ver}
+%requires_ge libqt4-x11
+%requires_ge python-qt4
%ifpython2
%requires_ge python2-qt4
Obsoletes: %{oldpython}-qscintilla < %{version}
@@ -45,8 +45,6 @@
Obsoletes: python3-qscintilla < %{version}
Provides: python3-qscintilla = %{version}
%endif
-%requires_ge libqt4-x11
-
%python_subpackages
%description
@@ -55,7 +53,6 @@
This is a Qt port from the original Scintilla class
(http://www.scintilla.org/).
-
%package -n %{name}-sip
Summary: sip files for PyQScintilla
Group: Development/Libraries/Python
@@ -72,7 +69,6 @@
This package contains sip files used to generate bindings to
QScintilla.
-
%prep
%setup -q -n QScintilla_gpl-%{version}
@@ -80,8 +76,14 @@
%{python_expand cp -r Python Python_%{$python_bin_suffix}
pushd Python_%{$python_bin_suffix}
-$python configure.py
-
+$python configure.py \
+ --pyqt=PyQt4 \
+ --sip=%{_bindir}/sip-%{$python_bin_suffix} \
+ --pyqt-sipdir=%{_datadir}/sip/PyQt4 \
+ --qmake=%{_bindir}/qmake \
+ --no-dist-info \
+ --no-stubs \
+ --no-qsci-api
make %{?_smp_mflags}
popd
@@ -95,22 +97,14 @@
popd
-mv -T %{buildroot}%{_datadir}/qt4/qsci/api/python
%{buildroot}%{_datadir}/qt4/qsci/api/python_%{$python_bin_suffix}
-
}
%files %{python_files}
-%defattr(-,root,root)
-%doc NEWS README LICENSE
+%license LICENSE
+%doc NEWS README
%{python_sitearch}/PyQt4/Qsci.so
-%{python_sitearch}/PyQt4/Qsci.pyi
-%dir %{_datadir}/qt4/qsci/
-%dir %{_datadir}/qt4/qsci/api/
-%dir %{_datadir}/qt4/qsci/api/python_%{python_bin_suffix}/
-%{_datadir}/qt4/qsci/api/python_%{python_bin_suffix}/QScintilla2.api
%files -n %{name}-sip
-%defattr(-,root,root)
%{_datadir}/sip/PyQt4/Qsci
%changelog
++++++ python-qscintilla-qt5.spec ++++++
--- /var/tmp/diff_new_pack.DTGkvD/_old 2018-10-23 20:38:41.640665902 +0200
+++ /var/tmp/diff_new_pack.DTGkvD/_new 2018-10-23 20:38:41.648665893 +0200
@@ -12,37 +12,36 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-qscintilla-qt5
-Version: 2.10.4
+Version: 2.10.8
Release: 0
Summary: Python Bindings for the C++ Editor Class Library
License: GPL-3.0-only
Group: Development/Libraries/C and C++
-Url: http://www.riverbankcomputing.co.uk/qscintilla
+URL: http://www.riverbankcomputing.co.uk/qscintilla
Source: QScintilla_gpl-%{version}.tar.gz
#PATCH-FIX-OPENSUSE: Rename qscintilla2 to qscintilla2-qt5:
Patch0: python-config.diff
BuildRequires: %{python_module devel}
BuildRequires: %{python_module qt5-devel}
-BuildRequires: %{python_module sip-devel >= 4.19.4}
+BuildRequires: %{python_module sip-devel >= 4.19.8}
BuildRequires: libqscintilla_qt5-devel
+BuildRequires: pkgconfig
BuildRequires: python-rpm-macros
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5Widgets)
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-sip = %{version}
-%requires_ge python-qt5
Requires: python-sip(api) = %{python_sip_api_ver}
+%requires_ge python-qt5
%ifpython2
%requires_ge python2-qt5
%endif
-
%python_subpackages
%description
@@ -53,7 +52,6 @@
This package is mainly used by eric, the Python IDE.
-
%package -n %{name}-sip
Summary: Sip files for PyQScintilla
Group: Development/Libraries/Python
@@ -64,7 +62,6 @@
python3-qscintilla packages. It contains sip files used to generate
bindings to QScintilla
-
%prep
%setup -q -n QScintilla_gpl-%{version}
%patch0 -p1
@@ -73,7 +70,15 @@
%{python_expand cp -r Python Python_%{$python_bin_suffix}
pushd Python_%{$python_bin_suffix}
-$python configure.py --pyqt=PyQt5 --qmake=%{_bindir}/qmake-qt5
+$python configure.py \
+ --pyqt=PyQt5 \
+ --sip=%{_bindir}/sip-%{$python_bin_suffix} \
+ --pyqt-sipdir=%{_datadir}/sip/PyQt5 \
+ --qsci-incdir=%{_libqt5_includedir} \
+ --qmake=%{_bindir}/qmake-qt5 \
+ --no-dist-info \
+ --no-stubs \
+ --no-qsci-api
make %{?_smp_mflags}
@@ -88,22 +93,15 @@
popd
-mv -T %{buildroot}%{_datadir}/qt5/qsci/api/python
%{buildroot}%{_datadir}/qt5/qsci/api/python_%{$python_bin_suffix}
-
}
%files %{python_files}
-%defattr(-,root,root)
-%doc NEWS README LICENSE
+%license LICENSE
+%doc NEWS README
%{python_sitearch}/PyQt5/Qsci.so
-%{python_sitearch}/PyQt5/Qsci.pyi
-%dir %{_datadir}/qt5/qsci/
-%dir %{_datadir}/qt5/qsci/api/
-%dir %{_datadir}/qt5/qsci/api/python_%{python_bin_suffix}/
-%{_datadir}/qt5/qsci/api/python_%{python_bin_suffix}/QScintilla2.api
%files -n %{name}-sip
-%defattr(-,root,root)
+%license LICENSE
%{_datadir}/sip/PyQt5/Qsci
%changelog
++++++ qscintilla-qt4.spec ++++++
--- /var/tmp/diff_new_pack.DTGkvD/_old 2018-10-23 20:38:41.672665864 +0200
+++ /var/tmp/diff_new_pack.DTGkvD/_new 2018-10-23 20:38:41.684665850 +0200
@@ -12,25 +12,24 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define sonum 13
%define debug_package_requires libqscintilla2_qt4-%{sonum} =
%{version}-%{release}
Name: qscintilla-qt4
-Version: 2.10.4
+Version: 2.10.8
Release: 0
Summary: C++ Editor Class Library
License: GPL-3.0-only
Group: Development/Libraries/C and C++
-Url: http://www.riverbankcomputing.co.uk/software/qscintilla/intro
+URL: http://www.riverbankcomputing.co.uk/software/qscintilla/intro
Source: QScintilla_gpl-%{version}.tar.gz
#PATCH-FIX-OPENSUSE: Adapt to the SuSE Qt4 build
Patch0: qscintilla-qt4.diff
BuildRequires: libdrm-devel
BuildRequires: libqt4-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class.
@@ -74,7 +73,7 @@
%prep
%setup -q -n QScintilla_gpl-%{version}
-%patch0
+%patch0 -p1
%build
pushd Qt4Qt5
@@ -95,18 +94,16 @@
popd
%post -n libqscintilla2_qt4-%{sonum} -p /sbin/ldconfig
-
%postun -n libqscintilla2_qt4-%{sonum} -p /sbin/ldconfig
%files -n libqscintilla2_qt4-%{sonum}
-%defattr(-,root,root)
-%doc NEWS README LICENSE
+%license LICENSE
+%doc NEWS README
%{_datadir}/qt4/qsci
%{_datadir}/qt4/translations/qscintilla_*.qm
%{_libdir}/libqscintilla2_qt4.so.%{sonum}*
%files -n libqscintilla_qt4-devel
-%defattr(-,root,root)
%{_includedir}/Qsci/
%{_libdir}/libqscintilla2_qt4.so
%{_libdir}/qt4/plugins/designer/libqscintillaplugin.so
++++++ qscintilla-qt5.spec ++++++
--- /var/tmp/diff_new_pack.DTGkvD/_old 2018-10-23 20:38:41.708665821 +0200
+++ /var/tmp/diff_new_pack.DTGkvD/_new 2018-10-23 20:38:41.712665816 +0200
@@ -12,27 +12,27 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define sonum 13
%define debug_package_requires libqscintilla2_qt5-%{sonum} =
%{version}-%{release}
Name: qscintilla-qt5
-Version: 2.10.4
+Version: 2.10.8
Release: 0
Summary: C++ Editor Class Library
License: GPL-3.0-only
Group: Development/Libraries/C and C++
-Url: http://www.riverbankcomputing.co.uk/software/qscintilla/intro
+URL: http://www.riverbankcomputing.co.uk/software/qscintilla/intro
Source: QScintilla_gpl-%{version}.tar.gz
#PATCH-FIX-OPENSUSE: Adapt to the SuSE Qt5 build
Patch0: qscintilla-qt5.diff
+BuildRequires: pkgconfig
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Designer)
BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5Widgets)
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class.
@@ -64,8 +64,7 @@
Requires: pkgconfig(Qt5PrintSupport)
Requires: pkgconfig(Qt5Widgets)
Provides: libqscintilla-qt5-devel = %{version}
-# Change from "<= " to "<" in next release after 2.10
-Obsoletes: libqscintilla-qt5-devel <= %{version}
+Obsoletes: libqscintilla-qt5-devel < %{version}
%description -n libqscintilla_qt5-devel
QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class.
@@ -77,7 +76,7 @@
%prep
%setup -q -n QScintilla_gpl-%{version}
-%patch0
+%patch0 -p1
%build
pushd Qt4Qt5
@@ -98,18 +97,16 @@
popd
%post -n libqscintilla2_qt5-%{sonum} -p /sbin/ldconfig
-
%postun -n libqscintilla2_qt5-%{sonum} -p /sbin/ldconfig
%files -n libqscintilla2_qt5-%{sonum}
-%defattr(-,root,root)
-%doc NEWS README LICENSE
+%license LICENSE
+%doc NEWS README
%{_datadir}/qt5/qsci/
%{_datadir}/qt5/translations/
%{_libdir}/libqscintilla2_qt5.so.%{sonum}*
%files -n libqscintilla_qt5-devel
-%defattr(-,root,root)
%{_includedir}/qt5/Qsci/
%{_libdir}/libqscintilla2_qt5.so
%{_libdir}/qt5/plugins/designer/libqscintillaplugin.so
++++++ QScintilla_gpl-2.10.4.tar.gz -> QScintilla_gpl-2.10.8.tar.gz ++++++
++++ 48369 lines of diff (skipped)
++++++ python-config.diff ++++++
--- /var/tmp/diff_new_pack.DTGkvD/_old 2018-10-23 20:38:42.184665252 +0200
+++ /var/tmp/diff_new_pack.DTGkvD/_new 2018-10-23 20:38:42.188665247 +0200
@@ -1,6 +1,8 @@
---- QScintilla_gpl-2.10.orig/Python/configure.py 2017-02-20
07:49:30.000000000 -0500
-+++ QScintilla_gpl-2.10/Python/configure.py 2017-02-28 22:46:27.978777650
-0500
-@@ -1415,6 +1415,9 @@
+diff --git a/Python/configure.py b/Python/configure.py
+index 16398e9..82ff333 100644
+--- a/Python/configure.py
++++ b/Python/configure.py
+@@ -1456,6 +1456,9 @@ def _generate_pro(target_config, opts, module_config,
all_installs):
config = qmake_config.get('CONFIG')
if config:
pro.write('CONFIG += %s\n' % config)
++++++ qscintilla-qt4.diff ++++++
--- /var/tmp/diff_new_pack.DTGkvD/_old 2018-10-23 20:38:42.196665238 +0200
+++ /var/tmp/diff_new_pack.DTGkvD/_new 2018-10-23 20:38:42.204665228 +0200
@@ -1,11 +1,10 @@
-Index: designer-Qt4Qt5/designer.pro
-===================================================================
---- designer-Qt4Qt5/designer.pro.orig 2011-11-23 01:10:02.000000000 -0500
-+++ designer-Qt4Qt5/designer.pro 2011-11-23 01:11:58.000000000 -0500
-@@ -22,2 +22,5 @@
+diff --git a/designer-Qt4Qt5/designer.pro b/designer-Qt4Qt5/designer.pro
+index fb5feca..7b58651 100644
+--- a/designer-Qt4Qt5/designer.pro
++++ b/designer-Qt4Qt5/designer.pro
+@@ -24,3 +24,5 @@ SOURCES = qscintillaplugin.cpp
+
target.path = $$[QT_INSTALL_PLUGINS]/designer
INSTALLS += target
-+
+LIBS += -L../Qt4Qt5 -lqscintilla2_qt4
+INCLUDEPATH += ../Qt4Qt5
-
++++++ qscintilla-qt5.diff ++++++
--- /var/tmp/diff_new_pack.DTGkvD/_old 2018-10-23 20:38:42.212665219 +0200
+++ /var/tmp/diff_new_pack.DTGkvD/_new 2018-10-23 20:38:42.212665219 +0200
@@ -1,11 +1,10 @@
-Index: designer-Qt4Qt5/designer.pro
-===================================================================
---- designer-Qt4Qt5/designer.pro.orig 2011-11-23 01:10:02.000000000 -0500
-+++ designer-Qt4Qt5/designer.pro 2011-11-23 01:11:58.000000000 -0500
-@@ -22,2 +22,5 @@
+diff --git a/designer-Qt4Qt5/designer.pro b/designer-Qt4Qt5/designer.pro
+index fb5feca..a3a3a21 100644
+--- a/designer-Qt4Qt5/designer.pro
++++ b/designer-Qt4Qt5/designer.pro
+@@ -24,3 +23,5 @@ SOURCES = qscintillaplugin.cpp
+
target.path = $$[QT_INSTALL_PLUGINS]/designer
INSTALLS += target
-+
+LIBS += -L../Qt4Qt5 -lqscintilla2_qt5
+INCLUDEPATH += ../Qt4Qt5
-
