From f27f0c93d27b59f441f58fe65da3e9a2963af6c665473d4ddb9047cddca52e6c Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 20 Apr 2021 05:55:52 +0000 Subject: [PATCH 1/3] Accepting request 883705 from home:dirkmueller:Factory - avoid repackaging the pkgconfig and cmake directories - they are provided by the filesystem package OBS-URL: https://build.opensuse.org/request/show/883705 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python3-pyside2?expand=0&rev=46 --- python3-pyside2.changes | 6 ++++++ python3-pyside2.spec | 12 +++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/python3-pyside2.changes b/python3-pyside2.changes index 827651f..f20286b 100644 --- a/python3-pyside2.changes +++ b/python3-pyside2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 7 22:56:48 UTC 2021 - Dirk Müller + +- avoid repackaging the pkgconfig and cmake directories - they are + provided by the filesystem package + ------------------------------------------------------------------- Tue Sep 15 06:23:38 UTC 2020 - Christophe Giboudeaux diff --git a/python3-pyside2.spec b/python3-pyside2.spec index dfb25e9..eb88ccc 100644 --- a/python3-pyside2.spec +++ b/python3-pyside2.spec @@ -1,7 +1,7 @@ # # spec file for package python3-pyside2 # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,7 +29,7 @@ Summary: Python bindings for Qt # Most files are LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) # pyside2-tools is GPL-2.0-only # shiboken2 contains files under GPL-3.0-only WITH Qt-GPL-exception-1.0 -License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) AND GPL-2.0-only AND GPL-3.0-only WITH Qt-GPL-exception-1.0 +License: (GPL-2.0-only AND (GPL-2.0-only OR GPL-3.0-or-later) AND GPL-3.0-only WITH Qt-GPL-exception-1.0) OR LGPL-3.0-only Group: Development/Languages/Python URL: http://wiki.qt.io/Qt_for_Python Source0: https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-%{version}-src/pyside-setup-opensource-src-%{version}.tar.xz @@ -105,7 +105,7 @@ application and UI framework. %package devel Summary: Header Files for PySide2 -License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) AND GPL-2.0-only AND GPL-3.0-only WITH Qt-GPL-exception-1.0 +License: (GPL-2.0-only AND (GPL-2.0-only OR GPL-3.0-or-later) AND GPL-3.0-only WITH Qt-GPL-exception-1.0) OR LGPL-3.0-only Group: Development/Languages/Python Requires: %{name} = %{version} @@ -197,8 +197,10 @@ rm -Rf %{buildroot}%{_datadir}/PySide2/typesystems/typesystem_*_win.xml %exclude %{_datadir}/PySide2/examples %{_includedir}/* %{_libdir}/*.so -%{_libdir}/cmake -%{_libdir}/pkgconfig +%{_libdir}/cmake/PySide2-%{version} +%{_libdir}/cmake/Shiboken2-%{version} +%{_libdir}/pkgconfig/pyside2.pc +%{_libdir}/pkgconfig/shiboken2.pc %{_mandir}/man*/* %files examples From 8f5a5f5acfffd1e97ffabd1817dd9f8c63faa9ee08d1f2ede8b9c826f880cfe4 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 20 Apr 2021 05:56:51 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python3-pyside2?expand=0&rev=47 --- python3-pyside2.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python3-pyside2.spec b/python3-pyside2.spec index eb88ccc..1ad0f6a 100644 --- a/python3-pyside2.spec +++ b/python3-pyside2.spec @@ -29,7 +29,7 @@ Summary: Python bindings for Qt # Most files are LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) # pyside2-tools is GPL-2.0-only # shiboken2 contains files under GPL-3.0-only WITH Qt-GPL-exception-1.0 -License: (GPL-2.0-only AND (GPL-2.0-only OR GPL-3.0-or-later) AND GPL-3.0-only WITH Qt-GPL-exception-1.0) OR LGPL-3.0-only +License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) AND GPL-2.0-only AND GPL-3.0-only WITH Qt-GPL-exception-1.0 Group: Development/Languages/Python URL: http://wiki.qt.io/Qt_for_Python Source0: https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-%{version}-src/pyside-setup-opensource-src-%{version}.tar.xz @@ -105,7 +105,7 @@ application and UI framework. %package devel Summary: Header Files for PySide2 -License: (GPL-2.0-only AND (GPL-2.0-only OR GPL-3.0-or-later) AND GPL-3.0-only WITH Qt-GPL-exception-1.0) OR LGPL-3.0-only +License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) AND GPL-2.0-only AND GPL-3.0-only WITH Qt-GPL-exception-1.0 Group: Development/Languages/Python Requires: %{name} = %{version} From 67f885d4375b41cc55252381310d2fd3525547fd578ccbe04aa3af53b55e7113 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 23 Apr 2021 12:14:16 +0000 Subject: [PATCH 3/3] Accepting request 888020 from KDE:Qt:5.15 forward to devel project OBS-URL: https://build.opensuse.org/request/show/888020 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python3-pyside2?expand=0&rev=48 --- python3-pyside2.changes | 5 +++++ python3-pyside2.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/python3-pyside2.changes b/python3-pyside2.changes index f20286b..e3de8b8 100644 --- a/python3-pyside2.changes +++ b/python3-pyside2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 23 12:10:27 UTC 2021 - Christophe Giboudeaux + +- Exclude internal imports detected by qml-autoreqprov. + ------------------------------------------------------------------- Wed Apr 7 22:56:48 UTC 2021 - Dirk Müller diff --git a/python3-pyside2.spec b/python3-pyside2.spec index 1ad0f6a..8f9d8c4 100644 --- a/python3-pyside2.spec +++ b/python3-pyside2.spec @@ -18,6 +18,9 @@ %bcond_with tests +# QML imports created and used by examples +%global __requires_exclude qmlimport\\((Charts|TextBalloonPlugin) + %define mypython python3 BuildRequires: python3-devel BuildRequires: python3-setuptools