Accepting request 1321099 from KDE:Qt6

- Use the distro flags

OBS-URL: https://build.opensuse.org/request/show/1321099
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python3-pyside6?expand=0&rev=48

0001-Fix-installation.patch

@@ -0,0 +1,57 @@
+From c069622d35a00485742b125caf9439b31b1b972f Mon Sep 17 00:00:00 2001
+From: Christophe Marin <christophe@krop.fr>
+Date: Tue, 7 Oct 2025 15:54:32 +0200
+Subject: [PATCH] Fix installation
+
+Upstream decided to install files in non-standard locations.
+---
+ sources/pyside6/CMakeLists.txt               | 2 +-
+ sources/shiboken6/generator/CMakeLists.txt   | 4 ++--
+ sources/shiboken6/libshiboken/CMakeLists.txt | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/sources/pyside6/CMakeLists.txt b/sources/pyside6/CMakeLists.txt
+index 6b73d70..74aaba5 100644
+--- a/sources/pyside6/CMakeLists.txt
++++ b/sources/pyside6/CMakeLists.txt
+@@ -40,7 +40,7 @@ install(EXPORT PySide6Targets
+ if(NOT is_pyside6_superproject_build)
+     install(EXPORT PySide6WheelTargets
+             NAMESPACE PySide6::
+-            DESTINATION "${LIB_INSTALL_DIR}/wheels/cmake/PySide6"
++            DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6"
+             FILE PySide6Targets.cmake)
+ endif()
+ 
+diff --git a/sources/shiboken6/generator/CMakeLists.txt b/sources/shiboken6/generator/CMakeLists.txt
+index 997468f..d0948d9 100644
+--- a/sources/shiboken6/generator/CMakeLists.txt
++++ b/sources/shiboken6/generator/CMakeLists.txt
+@@ -73,11 +73,11 @@ install(EXPORT "${package_name}Targets"
+ if(NOT is_pyside6_superproject_build)
+     install(TARGETS shiboken6
+             EXPORT "${package_name}WheelTargets"
+-            DESTINATION "shiboken6_generator")
++            DESTINATION "${BIN_INSTALL_DIR}")
+ 
+     install(EXPORT "${package_name}WheelTargets"
+             NAMESPACE "Shiboken6::"
+-            DESTINATION "${LIB_INSTALL_DIR}/wheels/cmake/${package_name}"
++            DESTINATION "${LIB_INSTALL_DIR}/cmake/${package_name}"
+             FILE "${package_name}Targets.cmake")
+ endif()
+ 
+diff --git a/sources/shiboken6/libshiboken/CMakeLists.txt b/sources/shiboken6/libshiboken/CMakeLists.txt
+index 973d14b..c4235f8 100644
+--- a/sources/shiboken6/libshiboken/CMakeLists.txt
++++ b/sources/shiboken6/libshiboken/CMakeLists.txt
+@@ -217,6 +217,6 @@ if(NOT is_pyside6_superproject_build)
+ 
+     install(EXPORT Shiboken6WheelTargets
+             NAMESPACE Shiboken6::
+-            DESTINATION "${LIB_INSTALL_DIR}/wheels/cmake/Shiboken6"
++            DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6"
+             FILE Shiboken6Targets.cmake)
+ endif()
+-- 
+2.51.0

0001-Revert-Modify-headers-installation-for-CMake-builds.patch

@@ -0,0 +1,231 @@
+From 80632681335d0dbc4b801a513a78ed921bd5377c Mon Sep 17 00:00:00 2001
+From: Christophe Marin <christophe@krop.fr>
+Date: Tue, 7 Oct 2025 14:14:43 +0200
+Subject: [PATCH] Revert "Modify headers installation for CMake builds"
+
+/usr/include/ is the correct location for include headers.
+
+---
+ build_scripts/platforms/unix.py                            | 4 ++--
+ build_scripts/platforms/windows_desktop.py                 | 7 ++++---
+ sources/pyside6/PySide6/CMakeLists.txt                     | 2 +-
+ sources/pyside6/PySide6/QtCore/CMakeLists.txt              | 2 +-
+ sources/pyside6/PySide6/QtDBus/CMakeLists.txt              | 2 +-
+ sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt | 2 +-
+ sources/pyside6/PySide6/QtDesigner/CMakeLists.txt          | 2 +-
+ sources/pyside6/PySide6/QtGraphs/CMakeLists.txt            | 2 +-
+ sources/pyside6/PySide6/QtGui/CMakeLists.txt               | 2 +-
+ sources/pyside6/cmake/Macros/PySideModules.cmake           | 2 +-
+ sources/pyside6/libpyside/CMakeLists.txt                   | 4 ++--
+ sources/pyside6/libpysideqml/CMakeLists.txt                | 2 +-
+ sources/pyside6/libpysideremoteobjects/CMakeLists.txt      | 2 +-
+ sources/shiboken6/data/shiboken6.pc.in                     | 2 +-
+ sources/shiboken6/libshiboken/CMakeLists.txt               | 4 ++--
+ 15 files changed, 21 insertions(+), 20 deletions(-)
+
+diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py
+index 59c63fd..03b814e 100644
+--- a/build_scripts/platforms/unix.py
++++ b/build_scripts/platforms/unix.py
+@@ -108,8 +108,8 @@ def prepare_packages_posix(pyside_build, _vars, cross_build=False):
+             "{st_build_dir}/{st_package_name}/scripts/shiboken_tool.py",
+             force=False, _vars=_vars)
+ 
+-    if config.is_internal_shiboken_module_build() or config.is_internal_pyside_build():
+-        # <install>/{cmake_package_name}/include/* -> <package_for_wheels>/{st_package_name}/include
++    if config.is_internal_shiboken_generator_build() or config.is_internal_pyside_build():
++        # <install>/include/* -> <setup>/{st_package_name}/include
+         copydir(
+             "{install_dir}/{cmake_package_name}/include",
+             destination_dir / "include",
+diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py
+index e023ff0..83f06c3 100644
+--- a/build_scripts/platforms/windows_desktop.py
++++ b/build_scripts/platforms/windows_desktop.py
+@@ -94,10 +94,11 @@ def prepare_packages_win32(pyside_build, _vars):
+             _filter=pdbs,
+             recursive=False, _vars=_vars)
+ 
+-    if config.is_internal_shiboken_module_build() or config.is_internal_pyside_build():
+-        # <install>/{cmake_package_name}/include/* -> <package_for_wheels>/{st_package_name}/include
++    if config.is_internal_shiboken_generator_build() or config.is_internal_pyside_build():
++        # <install>/include/* -> <setup>/{st_package_name}/include
++
+         copydir(
+-            "{install_dir}/{cmake_package_name}/include",
++            "{install_dir}/include/{cmake_package_name}",
+             destination_dir / "include",
+             _vars=_vars)
+ 
+diff --git a/sources/pyside6/PySide6/CMakeLists.txt b/sources/pyside6/PySide6/CMakeLists.txt
+index c1934d9..ccfa843 100644
+--- a/sources/pyside6/PySide6/CMakeLists.txt
++++ b/sources/pyside6/PySide6/CMakeLists.txt
+@@ -119,7 +119,7 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/templates/widgets_common.xml
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/templates/datavisualization_common.xml
+         DESTINATION share/PySide6${pyside_SUFFIX}/typesystems)
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pyside6_global.h
+-        DESTINATION ${BINDING_NAME}${pyside6_SUFFIX}/include)
++        DESTINATION include/${BINDING_NAME}${pyside6_SUFFIX})
+ 
+ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/QtAsyncio"
+         DESTINATION "${PYTHON_SITE_PACKAGES}/${BINDING_NAME}${pyside6_SUFFIX}")
+diff --git a/sources/pyside6/PySide6/QtCore/CMakeLists.txt b/sources/pyside6/PySide6/QtCore/CMakeLists.txt
+index 2f49b61..6359ff4 100644
+--- a/sources/pyside6/PySide6/QtCore/CMakeLists.txt
++++ b/sources/pyside6/PySide6/QtCore/CMakeLists.txt
+@@ -306,4 +306,4 @@ if (APPLE)
+ endif()
+ 
+ install(FILES ${pyside6_SOURCE_DIR}/qtcorehelper.h ${pyside6_SOURCE_DIR}/qiopipe.h
+-        DESTINATION PySide6/include/QtCore/)
++        DESTINATION include/PySide6/QtCore/)
+diff --git a/sources/pyside6/PySide6/QtDBus/CMakeLists.txt b/sources/pyside6/PySide6/QtDBus/CMakeLists.txt
+index 49e86d1..5ee8dc6 100644
+--- a/sources/pyside6/PySide6/QtDBus/CMakeLists.txt
++++ b/sources/pyside6/PySide6/QtDBus/CMakeLists.txt
+@@ -51,4 +51,4 @@ create_pyside_module(NAME QtDBus
+                      TYPESYSTEM_PATH QtDBus_SOURCE_DIR
+                      SOURCES QtDBus_SRC)
+ 
+-install(FILES ${pyside6_SOURCE_DIR}/qtdbushelper.h DESTINATION PySide6/include/QtDBus)
++install(FILES ${pyside6_SOURCE_DIR}/qtdbushelper.h DESTINATION include/PySide6/QtDBus)
+diff --git a/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt b/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt
+index 424799b..1276b42 100644
+--- a/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt
++++ b/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt
+@@ -68,4 +68,4 @@ create_pyside_module(NAME QtDataVisualization
+                      STATIC_SOURCES QtDataVisualization_src)
+ 
+ install(FILES ${pyside6_SOURCE_DIR}/qtdatavisualization_helper.h
+-        DESTINATION PySide6/include/QtDataVisualization)
++        DESTINATION include/PySide6/QtDataVisualization)
+diff --git a/sources/pyside6/PySide6/QtDesigner/CMakeLists.txt b/sources/pyside6/PySide6/QtDesigner/CMakeLists.txt
+index 570ed0f..e91532b 100644
+--- a/sources/pyside6/PySide6/QtDesigner/CMakeLists.txt
++++ b/sources/pyside6/PySide6/QtDesigner/CMakeLists.txt
+@@ -67,4 +67,4 @@ create_pyside_module(NAME QtDesigner
+                      STATIC_SOURCES QtDesigner_static_src
+                      TYPESYSTEM_NAME ${QtDesigner_BINARY_DIR}/typesystem_designer.xml)
+ 
+-install(FILES ${pyside6_SOURCE_DIR}/qpydesignerextensions.h DESTINATION PySide6/include/QtDesigner)
++install(FILES ${pyside6_SOURCE_DIR}/qpydesignerextensions.h DESTINATION include/PySide6/QtDesigner)
+diff --git a/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt b/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt
+index f416078..29a7b25 100644
+--- a/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt
++++ b/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt
+@@ -96,4 +96,4 @@ create_pyside_module(NAME QtGraphs
+                      DROPPED_ENTRIES QtGraphs_DROPPED_ENTRIES)
+ 
+ install(FILES ${pyside6_SOURCE_DIR}/qtgraphs_helper.h
+-        DESTINATION PySide6/include/QtGraphs)
++        DESTINATION include/PySide6/QtGraphs)
+diff --git a/sources/pyside6/PySide6/QtGui/CMakeLists.txt b/sources/pyside6/PySide6/QtGui/CMakeLists.txt
+index b9e8429..1d2d411 100644
+--- a/sources/pyside6/PySide6/QtGui/CMakeLists.txt
++++ b/sources/pyside6/PySide6/QtGui/CMakeLists.txt
+@@ -366,4 +366,4 @@ create_pyside_module(NAME QtGui
+ 
+ install(FILES ${pyside6_SOURCE_DIR}/qpytextobject.h
+               ${pyside6_SOURCE_DIR}/qtguihelper.h
+-        DESTINATION PySide6/include/QtGui/)
++        DESTINATION include/PySide6/QtGui/)
+diff --git a/sources/pyside6/cmake/Macros/PySideModules.cmake b/sources/pyside6/cmake/Macros/PySideModules.cmake
+index 86791f4..7bb7714 100644
+--- a/sources/pyside6/cmake/Macros/PySideModules.cmake
++++ b/sources/pyside6/cmake/Macros/PySideModules.cmake
+@@ -378,7 +378,7 @@ macro(create_pyside_module)
+ 
+ 
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide6/${module_NAME}/pyside6_${lower_module_name}_python.h
+-            DESTINATION PySide6${pyside6_SUFFIX}/include/${module_NAME}/)
++            DESTINATION include/PySide6${pyside6_SUFFIX}/${module_NAME}/)
+     file(GLOB typesystem_files ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_*.xml ${typesystem_path})
+ 
+ #   Copy typesystem files and remove module names from the <load-typesystem> element
+diff --git a/sources/pyside6/libpyside/CMakeLists.txt b/sources/pyside6/libpyside/CMakeLists.txt
+index 75c2328..f8b25a4 100644
+--- a/sources/pyside6/libpyside/CMakeLists.txt
++++ b/sources/pyside6/libpyside/CMakeLists.txt
+@@ -101,7 +101,7 @@ append_size_optimization_flags(pyside6)
+ 
+ target_include_directories(pyside6 PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+-  $<INSTALL_INTERFACE:PySide6/include>
++  $<INSTALL_INTERFACE:include/PySide6>
+ )
+ 
+ target_compile_definitions(pyside6 PRIVATE -DQT_LEAN_HEADERS=1 -DQT_NO_KEYWORDS=1)
+@@ -177,7 +177,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySide6ConfigVersion.cmake.in"
+                "${CMAKE_CURRENT_BINARY_DIR}/PySide6ConfigVersion.cmake" @ONLY)
+ 
+ install(FILES ${libpyside_HEADERS}
+-        DESTINATION ${BINDING_NAME}${pyside6_SUFFIX}/include)
++        DESTINATION include/${BINDING_NAME}${pyside6_SUFFIX})
+ 
+ # build-time installation
+ install(TARGETS pyside6 EXPORT PySide6Targets
+diff --git a/sources/pyside6/libpysideqml/CMakeLists.txt b/sources/pyside6/libpysideqml/CMakeLists.txt
+index 1430334..dac3cdd 100644
+--- a/sources/pyside6/libpysideqml/CMakeLists.txt
++++ b/sources/pyside6/libpysideqml/CMakeLists.txt
+@@ -84,7 +84,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_T
+ qfp_strip_library("pyside6qml")
+ 
+ install(FILES ${libpysideqml_HEADERS}
+-        DESTINATION ${BINDING_NAME}${pyside6qml_SUFFIX}/include)
++        DESTINATION include/${BINDING_NAME}${pyside6qml_SUFFIX})
+ 
+ #built-time installation
+ install(TARGETS pyside6qml EXPORT PySide6Targets
+diff --git a/sources/pyside6/libpysideremoteobjects/CMakeLists.txt b/sources/pyside6/libpysideremoteobjects/CMakeLists.txt
+index caaadc2..4669fb6 100644
+--- a/sources/pyside6/libpysideremoteobjects/CMakeLists.txt
++++ b/sources/pyside6/libpysideremoteobjects/CMakeLists.txt
+@@ -80,7 +80,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_T
+ #
+ 
+ install(FILES ${libpysideremoteobjects_HEADERS}
+-        DESTINATION ${BINDING_NAME}${pyside6remoteobjects_SUFFIX}/include)
++        DESTINATION include/${BINDING_NAME}${pyside6remoteobjects_SUFFIX})
+ 
+ install(TARGETS pyside6remoteobjects EXPORT PySide6RemoteObjectsTargets
+                            LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
+diff --git a/sources/shiboken6/data/shiboken6.pc.in b/sources/shiboken6/data/shiboken6.pc.in
+index 917b706..a82d231 100644
+--- a/sources/shiboken6/data/shiboken6.pc.in
++++ b/sources/shiboken6/data/shiboken6.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+ libdir=@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@
+-includedir=@CMAKE_INSTALL_PREFIX@/shiboken6/include
++includedir=@CMAKE_INSTALL_PREFIX@/include/shiboken6
+ python_interpreter=@Python_EXECUTABLE@
+ python_include_dir=@Python_INCLUDE_DIRS@
+ 
+diff --git a/sources/shiboken6/libshiboken/CMakeLists.txt b/sources/shiboken6/libshiboken/CMakeLists.txt
+index 6136632..973d14b 100644
+--- a/sources/shiboken6/libshiboken/CMakeLists.txt
++++ b/sources/shiboken6/libshiboken/CMakeLists.txt
+@@ -111,7 +111,7 @@ add_library(Shiboken6::libshiboken ALIAS libshiboken)
+ target_include_directories(libshiboken PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+-  $<INSTALL_INTERFACE:shiboken6/include>
++  $<INSTALL_INTERFACE:include/shiboken6>
+ )
+ 
+ if (NOT "${NUMPY_INCLUDE_DIR}" STREQUAL "")
+@@ -196,7 +196,7 @@ install(FILES
+         signature.h
+         signature_p.h
+ 
+-        DESTINATION shiboken6${shiboken6_SUFFIX}/include)
++        DESTINATION include/shiboken6${shiboken6_SUFFIX})
+ install(TARGETS libshiboken EXPORT Shiboken6Targets
+                             LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
+                             ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
+-- 
+2.51.0
+

pyside-setup-everywhere-src-6.10.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd54f40853d61dfd845dbb40d4f89fbd63df5ed341b3d9a2c77bb5c947a0a838
+size 17746968

pyside-setup-everywhere-src-6.9.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:04c712c5b9234add0d9b5aa3c01a0caede64a55b496127751f5d52a230cff748
-size 16669448

python3-pyside6.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Mon Dec  1 09:44:04 UTC 2025 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Use the distro flags
+
+-------------------------------------------------------------------
+Thu Nov 20 15:31:19 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.10.1
+  * https://www.qt.io/blog/qt-6.10.1-released
+
+-------------------------------------------------------------------
+Tue Oct  7 10:42:33 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.10.0. Check the installed changes-6.10.0 file for the
+  full list of changes
+- Add patches:
+  * 0001-Revert-Modify-headers-installation-for-CMake-builds.patch
+  * 0001-Fix-installation.patch
+
+-------------------------------------------------------------------
+Wed Aug 27 07:18:40 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.9.2. Check the installed changes-6.9.2 file for the
+  full list of changes
+
 -------------------------------------------------------------------
 Tue Jun  3 16:07:10 UTC 2025 - Christophe Marin <christophe@krop.fr>
 

python3-pyside6.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python3-pyside6
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 %define tar_name pyside-setup-everywhere-src
-%define tar_version 6.9.1
+%define tar_version 6.10.1
 
 %global flavor @BUILD_FLAVOR@%{nil}
 %if "%flavor" == ""
@@ -43,18 +43,22 @@ ExclusiveArch:  donotbuild
 %endif
 
 Name:           %{mypython}-%{pyside_flavor}
-Version:        6.9.1
+Version:        6.10.1
 Release:        0
 Summary:        Python bindings for Qt 6
-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
 URL:            https://www.qt.io
 Source:         https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-%{version}-src/%{tar_name}-%{tar_version}.tar.xz
 # PATCH-FIX-OPENSUSE
 Patch0:         0001-Always-link-to-python-libraries.patch
+# PATCH-FIX-UPSTREAM
+Patch1:         0001-Revert-Modify-headers-installation-for-CMake-builds.patch
+# PATCH-FIX-UPSTREAM
+Patch2:         0001-Fix-installation.patch
 # SECTION common_dependencies
 BuildRequires:  clang-devel
 BuildRequires:  %{mypython}-Sphinx
-BuildRequires:  %{mypython}-devel >= 3.7
+BuildRequires:  %{mypython}-devel >= 3.10
 BuildRequires:  %{mypython}-numpy-devel
 BuildRequires:  %{mypython}-setuptools
 BuildRequires:  fdupes
@@ -133,9 +137,9 @@ BuildRequires:  cmake(Qt6MultimediaPrivate) >= %{version}
 BuildRequires:  cmake(Qt6MultimediaWidgets) >= %{version}
 BuildRequires:  cmake(Qt6MultimediaWidgetsPrivate) >= %{version}
 BuildRequires:  cmake(Qt6NetworkAuth) >= %{version}
+BuildRequires:  cmake(Qt6NetworkAuthPrivate) >= %{version}
 BuildRequires:  cmake(Qt6Nfc) >= %{version}
 BuildRequires:  cmake(Qt6NfcPrivate) >= %{version}
-BuildRequires:  cmake(Qt6NetworkAuthPrivate) >= %{version}
 BuildRequires:  cmake(Qt6OpenGL) >= %{version}
 BuildRequires:  cmake(Qt6OpenGLWidgets) >= %{version}
 BuildRequires:  cmake(Qt6Positioning) >= %{version}
@@ -143,11 +147,11 @@ BuildRequires:  cmake(Qt6PositioningPrivate) >= %{version}
 BuildRequires:  cmake(Qt6Qml) >= %{version}
 BuildRequires:  cmake(Qt6QmlPrivate) >= %{version}
 BuildRequires:  cmake(Qt6Quick) >= %{version}
-BuildRequires:  cmake(Qt6QuickPrivate) >= %{version}
 BuildRequires:  cmake(Qt6Quick3D) >= %{version}
 BuildRequires:  cmake(Qt6Quick3DPrivate) >= %{version}
 BuildRequires:  cmake(Qt6QuickControls2) >= %{version}
 BuildRequires:  cmake(Qt6QuickControls2Private) >= %{version}
+BuildRequires:  cmake(Qt6QuickPrivate) >= %{version}
 BuildRequires:  cmake(Qt6QuickTest) >= %{version}
 BuildRequires:  cmake(Qt6QuickTestPrivate) >= %{version}
 BuildRequires:  cmake(Qt6QuickWidgets) >= %{version}
@@ -170,7 +174,6 @@ BuildRequires:  cmake(Qt6StateMachinePrivate) >= %{version}
 BuildRequires:  cmake(Qt6Svg) >= %{version}
 BuildRequires:  cmake(Qt6SvgPrivate) >= %{version}
 BuildRequires:  cmake(Qt6SvgWidgets) >= %{version}
-BuildRequires:  cmake(Qt6SvgWidgetsPrivate) >= %{version}
 BuildRequires:  cmake(Qt6TextToSpeech) >= %{version}
 BuildRequires:  cmake(Qt6TextToSpeechPrivate) >= %{version}
 BuildRequires:  cmake(Qt6UiPlugin) >= %{version}
@@ -245,13 +248,9 @@ pushd sources/%{pyside_flavor}
 # numpy changed the include path on 2.0
 numpyinc=$(%{__mypython} -c 'import numpy; print(numpy.get_include())')
 
-# NOTE:The compiler and linker flags shall not be defined
 %cmake_qt6 \
   -DBUILD_TESTS:BOOL=ON \
   -DLIB_SUFFIX:STRING="${_libsuffix}" \
-  -DCMAKE_C_FLAGS:STRING="" \
-  -DCMAKE_CXX_FLAGS:STRING="" \
-  -DCMAKE_EXE_LINKER_FLAGS:STRING="" \
   -DPython_EXECUTABLE:STRING=%{__mypython} \
   -DNUMPY_INCLUDE_DIR:STRING=${numpyinc} \
   -DCMAKE_BUILD_RPATH_USE_ORIGIN:BOOL=ON \
@@ -273,8 +272,24 @@ popd
 
 %if "%{pyside_flavor}" == "shiboken6"
 sed -i 's@^#.*env python.*$@#!%{__mypython}@' %{buildroot}%{_bindir}/shiboken_tool.py
+
+# Delete weird copies
+rm -r %{buildroot}%{_prefix}/shiboken6
+
+# and fix broken library location
+sed -i 's#/shiboken6/libshiboken6#/%{_lib}/libshiboken6#' %{buildroot}%{_qt6_cmakedir}/Shiboken6/Shiboken6Targets-*.cmake
+
 %else
 rm %{buildroot}%{_datadir}/PySide6/typesystems/*_{mac,win}.xml
+
+# Also fix pyside manually
+mv %{buildroot}%{_prefix}/PySide6/* %{buildroot}%{_libdir}
+%define rel_sitearch %(printf %{mypython_sitearch} | sed 's#%{_prefix}/##')
+sed -i 's#PYSIDE_PYTHONPATH "\${PACKAGE_PREFIX_DIR}/#PYSIDE_PYTHONPATH "\${PACKAGE_PREFIX_DIR}/%{rel_sitearch}/PySide6/#' %{buildroot}%{_qt6_cmakedir}/PySide6/PySide6Config*.cmake
+sed -i 's#/PySide6/libpyside6#/%{_lib}/libpyside6#' %{buildroot}%{_qt6_cmakedir}/*/*.cmake
+sed -i 's#/typesystems#/share/PySide6/typesystems#' %{buildroot}%{_qt6_cmakedir}/PySide6/*.cmake
+sed -i 's#/glue#/share/PySide6/glue#' %{buildroot}%{_qt6_cmakedir}/PySide6/*.cmake
+
 %endif
 # Install egg-info
 # qtpaths is needed
@@ -393,7 +408,6 @@ popd
 %{_includedir}/PySide6/
 %{_libdir}/libpyside6qml.abi3.so
 %{_qt6_cmakedir}/PySide6/
-%{_qt6_cmakedir}/PySide6Qml/
 %endif
 %{_libdir}/lib%{pyside_flavor}.abi3.so
 %{_libdir}/pkgconfig/%{pyside_flavor}.pc