Hello community, here is the log from the commit of package qscintilla-qt5 for openSUSE:Factory checked in at 2019-04-28 20:00:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qscintilla-qt5 (Old) and /work/SRC/openSUSE:Factory/.qscintilla-qt5.new.5536 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qscintilla-qt5" Sun Apr 28 20:00:57 2019 rev:8 rq:694761 version:2.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/qscintilla-qt5/python-qscintilla-qt5.changes 2018-11-09 07:54:18.779718454 +0100 +++ /work/SRC/openSUSE:Factory/.qscintilla-qt5.new.5536/python-qscintilla-qt5.changes 2019-04-28 20:01:02.478877466 +0200 @@ -1,0 +2,25 @@ +Tue Apr 16 08:58:18 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Move some files out of the -devel package. + +------------------------------------------------------------------- +Fri Apr 5 08:26:16 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Add the lost changelog entries back. + +------------------------------------------------------------------- +Tue Apr 2 18:52:25 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Drop qscintilla-qt4 and python-qscintilla-qt4. +- Drop qscintilla-qt4.diff. No longer needed. +- Re-sync the changelog files. + +------------------------------------------------------------------- +Fri Feb 15 09:39:16 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Update to 2.11.1 + * Details at https://www.riverbankcomputing.com/static/Downloads/QScintilla/ChangeLog +- Refresh python-config.diff +- Drop reproducible.patch. Merged upstream + +------------------------------------------------------------------- @@ -24 +49 @@ -Tue Apr 17 12:31:35 UTC 2018 - [email protected] +Tue Apr 17 12:25:37 UTC 2018 - [email protected] @@ -59 +84,5 @@ -- Rename qt4 versions to use -qt4 suffix. +- Rename qt4 versions to use "_qt4" suffix. +- Use new qt-version-specific names provided by qscintilla 2.10 + rather than manually adding a "-qt5" suffix. +- Use "_qt5" suffix instead of "_qt4" for library packages to + conform to upstream library naming. @@ -72 +101 @@ -Wed Mar 1 02:22:52 UTC 2017 - [email protected] +Wed Mar 1 02:21:40 UTC 2017 - [email protected] @@ -138 +167 @@ -Tue Jan 3 21:59:21 UTC 2017 - [email protected] +Tue Jan 3 21:57:50 UTC 2017 - [email protected] @@ -164 +193 @@ -Sun Jul 19 19:30:29 UTC 2015 - [email protected] +Sat Jul 18 21:03:26 UTC 2015 - [email protected] --- /work/SRC/openSUSE:Factory/qscintilla-qt5/qscintilla-qt5.changes 2018-10-23 20:38:40.756666958 +0200 +++ /work/SRC/openSUSE:Factory/.qscintilla-qt5.new.5536/qscintilla-qt5.changes 2019-04-28 20:01:02.894877215 +0200 @@ -1,0 +2,31 @@ +Tue Apr 16 08:58:18 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Move some files out of the -devel package. + +------------------------------------------------------------------- +Fri Apr 5 08:26:16 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Add the lost changelog entries back. + +------------------------------------------------------------------- +Tue Apr 2 18:52:25 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Drop qscintilla-qt4 and python-qscintilla-qt4. +- Drop qscintilla-qt4.diff. No longer needed. +- Re-sync the changelog files. + +------------------------------------------------------------------- +Fri Feb 15 09:39:16 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Update to 2.11.1 + * Details at https://www.riverbankcomputing.com/static/Downloads/QScintilla/ChangeLog +- Refresh python-config.diff +- Drop reproducible.patch. Merged upstream + +------------------------------------------------------------------- +Wed Nov 7 20:10:51 UTC 2018 - Bernhard Wiedemann <[email protected]> + +- Add reproducible.patch to sort input file list to make package + build reproducible (boo#1041090) + +------------------------------------------------------------------- @@ -64,0 +96,5 @@ +Sun Mar 12 16:15:39 UTC 2017 - [email protected] + +- Implement single-spec version + +------------------------------------------------------------------- @@ -138 +174 @@ -Tue Jul 26 19:42:21 UTC 2016 - [email protected] +Tue Jul 26 19:39:28 UTC 2016 - [email protected] @@ -149,0 +186,5 @@ + +------------------------------------------------------------------- +Fri Aug 14 03:40:56 UTC 2015 - [email protected] + +- change required sip version to 4.16.9 Old: ---- QScintilla_gpl-2.10.8.tar.gz python-qscintilla-qt4.changes python-qscintilla-qt4.spec qscintilla-qt4.changes qscintilla-qt4.diff qscintilla-qt4.spec reproducible.patch New: ---- QScintilla_gpl-2.11.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qscintilla-qt5.spec ++++++ --- /var/tmp/diff_new_pack.8HyfZV/_old 2019-04-28 20:01:04.202876426 +0200 +++ /var/tmp/diff_new_pack.8HyfZV/_new 2019-04-28 20:01:04.206876423 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-qscintilla-qt5 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-qscintilla-qt5 -Version: 2.10.8 +Version: 2.11.1 Release: 0 Summary: Python Bindings for the C++ Editor Class Library License: GPL-3.0-only @@ -27,8 +27,6 @@ Source: QScintilla_gpl-%{version}.tar.gz #PATCH-FIX-OPENSUSE: Rename qscintilla2 to qscintilla2-qt5: Patch0: python-config.diff -#PATCH-FIX-OPENSUSE -Patch1: reproducible.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module qt5-devel} BuildRequires: %{python_module sip-devel >= 4.19.8} @@ -67,7 +65,6 @@ %prep %setup -q -n QScintilla_gpl-%{version} %patch0 -p1 -%patch1 -p1 %build %{python_expand cp -r Python Python_%{$python_bin_suffix} ++++++ qscintilla-qt5.spec ++++++ --- /var/tmp/diff_new_pack.8HyfZV/_old 2019-04-28 20:01:04.230876408 +0200 +++ /var/tmp/diff_new_pack.8HyfZV/_new 2019-04-28 20:01:04.230876408 +0200 @@ -1,7 +1,7 @@ # # spec file for package qscintilla-qt5 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,17 +16,17 @@ # -%define sonum 13 +%define sonum 15 %define debug_package_requires libqscintilla2_qt5-%{sonum} = %{version}-%{release} Name: qscintilla-qt5 -Version: 2.10.8 +Version: 2.11.1 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 Source: QScintilla_gpl-%{version}.tar.gz -#PATCH-FIX-OPENSUSE: Adapt to the SuSE Qt5 build +#PATCH-FIX-OPENSUSE: Adapt to the openSUSE Qt5 build Patch0: qscintilla-qt5.diff BuildRequires: pkgconfig BuildRequires: pkgconfig(Qt5Core) @@ -40,14 +40,22 @@ This is a Qt port from the original Scintilla class (http://www.scintilla.org/). -This package is mainly used by eric, the Python IDE. +%package -n qscintilla2_qt5 +Summary: C++ Editor Class Library +Group: Development/Tools/Other +Provides: qscintilla-qt5 = %{version} + +%description -n qscintilla2_qt5 +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/). %package -n libqscintilla2_qt5-%{sonum} Summary: C++ Editor Class Library Group: Development/Libraries/C and C++ +Requires: qscintilla2_qt5 = %{version} Provides: libqscintilla2-qt5-%{sonum} = %{version} -Provides: qscintilla-qt5 = %{version} -# Change from "<= " to "<" in next release after 2.10 Obsoletes: libqscintilla2-qt5-%{sonum} < %{version} %description -n libqscintilla2_qt5-%{sonum} @@ -99,17 +107,20 @@ %post -n libqscintilla2_qt5-%{sonum} -p /sbin/ldconfig %postun -n libqscintilla2_qt5-%{sonum} -p /sbin/ldconfig -%files -n libqscintilla2_qt5-%{sonum} +%files -n qscintilla2_qt5 %license LICENSE %doc NEWS README %{_datadir}/qt5/qsci/ %{_datadir}/qt5/translations/ +%{_libdir}/qt5/plugins/designer/libqscintillaplugin.so + +%files -n libqscintilla2_qt5-%{sonum} +%license LICENSE %{_libdir}/libqscintilla2_qt5.so.%{sonum}* %files -n libqscintilla_qt5-devel %{_includedir}/qt5/Qsci/ %{_libdir}/libqscintilla2_qt5.so -%{_libdir}/qt5/plugins/designer/libqscintillaplugin.so %{_libdir}/qt5/mkspecs/features/qscintilla2.prf %changelog ++++++ QScintilla_gpl-2.10.8.tar.gz -> QScintilla_gpl-2.11.1.tar.gz ++++++ ++++ 64498 lines of diff (skipped) ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.8HyfZV/_old 2019-04-28 20:01:04.762876088 +0200 +++ /var/tmp/diff_new_pack.8HyfZV/_new 2019-04-28 20:01:04.762876088 +0200 @@ -1,6 +1,3 @@ #!/bin/bash # This script is called automatically during autobuild checkin. - -ln -f qscintilla-qt5.changes qscintilla-qt4.changes ln -f qscintilla-qt5.changes python-qscintilla-qt5.changes -ln -f qscintilla-qt5.changes python-qscintilla-qt4.changes ++++++ python-config.diff ++++++ --- /var/tmp/diff_new_pack.8HyfZV/_old 2019-04-28 20:01:04.774876080 +0200 +++ /var/tmp/diff_new_pack.8HyfZV/_new 2019-04-28 20:01:04.774876080 +0200 @@ -1,8 +1,8 @@ diff --git a/Python/configure.py b/Python/configure.py -index 16398e9..82ff333 100644 +index 8c61f11..9d57bb5 100644 --- a/Python/configure.py +++ b/Python/configure.py -@@ -1456,6 +1456,9 @@ def _generate_pro(target_config, opts, module_config, all_installs): +@@ -1458,6 +1458,9 @@ def _generate_pro(target_config, opts, module_config, all_installs): config = qmake_config.get('CONFIG') if config: pro.write('CONFIG += %s\n' % config)
