Hello community,

here is the log from the commit of package python-pyside2 for openSUSE:Factory 
checked in at 2018-03-13 10:25:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pyside2 (Old)
 and      /work/SRC/openSUSE:Factory/.python-pyside2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-pyside2"

Tue Mar 13 10:25:01 2018 rev:2 rq:586166 version:2.0~pre.1519723362.e621f811

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pyside2/python-pyside2.changes    
2017-08-24 18:34:56.608929981 +0200
+++ /work/SRC/openSUSE:Factory/.python-pyside2.new/python-pyside2.changes       
2018-03-13 10:25:10.419330237 +0100
@@ -1,0 +2,24 @@
+Tue Mar 13 07:07:28 UTC 2018 - adr...@suse.de
+
+- disable python2 build
+  No one needs it atm and it is conflicting at installation time
+  with python3 variant
+
+-------------------------------------------------------------------
+Mon Mar  5 05:52:58 UTC 2018 - adr...@suse.de
+
+- update to current snapshot from dev branch for Qt 5.10
+- make test optional
+- fix-cmake.patch lib64.patch for fixing build and installation
+
+-------------------------------------------------------------------
+Sat Mar  3 06:26:03 UTC 2018 - adr...@suse.de
+
+- build fix
+
+-------------------------------------------------------------------
+Thu Sep 14 20:15:52 UTC 2017 - kkae...@suse.com
+
+- add Qt5-svg support
+
+-------------------------------------------------------------------

Old:
----
  pyside-setup-2.0~pre.1497016158.a3e4e367.obscpio

New:
----
  _multibuild
  fix-cmake.patch
  lib64.patch
  pyside-setup-2.0~pre.1519723362.e621f811.obscpio

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

Other differences:
------------------
++++++ python-pyside2.spec ++++++
--- /var/tmp/diff_new_pack.SxXVlS/_old  2018-03-13 10:25:13.831207991 +0100
+++ /var/tmp/diff_new_pack.SxXVlS/_new  2018-03-13 10:25:13.835207849 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package python-pyside
+# spec file for package python
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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,50 +16,92 @@
 #
 
 
-%define _name      pyside2
-%define libprefix  lib%{_name}
-%define pyname     PySide
-Name:           python-%{_name}
-Version:        2.0~pre.1497016158.a3e4e367
+%bcond_with tests
+
+%if "@BUILD_FLAVOR@" == ""
+ExclusiveArch:  do_not_build
+Name:           do_not_build
+%endif
+%if "@BUILD_FLAVOR@" == "python3-pyside2"
+%define mypython python3
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+Name:           python3-pyside2
+%else
+%define mypython python
+BuildRequires:  python-devel >= 2.6
+BuildRequires:  python-setuptools
+Name:           python-pyside2
+%endif
+
+Version:        2.0~pre.1519723362.e621f811
 Release:        0
 Summary:        PySide - python bindings for Qt
-License:        LGPL-2.1+
+License:        LGPL-2.1-or-later
 Group:          Development/Languages/Python
 Url:            http://qt-project.org/wiki/PySide
 Source0:        pyside-setup-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM broken cmake files
+Patch1:         fix-cmake.patch
+# PATCH-FIX-UPSTREAM missing lib suffix handling
+Patch2:         lib64.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-BuildRequires:  pkgconfig(Qt5Core) >= 5.9
-BuildRequires:  pkgconfig(Qt5Core) < 5.10
+
+BuildRequires:  git
+BuildRequires:  libqt5-qtdeclarative-private-headers-devel
+
+##### essential modules
+BuildRequires:  pkgconfig(Qt5Concurrent)
+BuildRequires:  pkgconfig(Qt5Concurrent)
+BuildRequires:  pkgconfig(Qt5Core) < 5.11
+BuildRequires:  pkgconfig(Qt5Core) >= 5.10
+BuildRequires:  pkgconfig(Qt5Network)
 BuildRequires:  pkgconfig(Qt5PrintSupport)
-BuildRequires:  pkgconfig(Qt5Xml)
-BuildRequires:  pkgconfig(Qt5Designer)
+BuildRequires:  pkgconfig(Qt5Sql)
+BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(Qt5Widgets)
-BuildRequires:  pkgconfig(Qt5XmlPatterns)
-BuildRequires:  pkgconfig(Qt5Multimedia)
-BuildRequires:  pkgconfig(Qt5Concurrent)
 BuildRequires:  pkgconfig(Qt5X11Extras)
+BuildRequires:  pkgconfig(Qt5Xml)
+BuildRequires:  pkgconfig(Qt5XmlPatterns)
+
+##### optional modules
+BuildRequires:  libQt53DQuickScene2D5
+BuildRequires:  pkgconfig(Qt53DAnimation)
+BuildRequires:  pkgconfig(Qt53DCore)
+BuildRequires:  pkgconfig(Qt53DExtras)
+BuildRequires:  pkgconfig(Qt53DInput)
+BuildRequires:  pkgconfig(Qt53DLogic)
+BuildRequires:  pkgconfig(Qt53DRender)
+BuildRequires:  pkgconfig(Qt5Charts)
+BuildRequires:  pkgconfig(Qt5DataVisualization)
+BuildRequires:  pkgconfig(Qt5Designer)
 BuildRequires:  pkgconfig(Qt5Multimedia)
 BuildRequires:  pkgconfig(Qt5MultimediaWidgets)
 BuildRequires:  pkgconfig(Qt5OpenGL)
 BuildRequires:  pkgconfig(Qt5QuickWidgets)
 BuildRequires:  pkgconfig(Qt5Script)
 BuildRequires:  pkgconfig(Qt5ScriptTools)
-#BuildRequires:  pkgconfig(Qt5TextToSpeech)
-#BuildRequires:  pkgconfig(Qt5Charts)
+BuildRequires:  pkgconfig(Qt5Svg)
+BuildRequires:  pkgconfig(Qt5TextToSpeech)
+BuildRequires:  pkgconfig(Qt5TextToSpeech)
 BuildRequires:  pkgconfig(Qt5WebChannel)
 BuildRequires:  pkgconfig(Qt5WebEngineWidgets)
 BuildRequires:  pkgconfig(Qt5WebKit)
-BuildRequires:  pkgconfig(Qt5WebKitWidgets)
 BuildRequires:  pkgconfig(Qt5WebSockets)
-BuildRequires:  libqt5-qtdeclarative-private-headers-devel
+BuildRequires:  pkgconfig(Qt5WebSockets)
+BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  pkgconfig(Qt5Xml)
+BuildRequires:  pkgconfig(Qt5XmlPatterns)
+#breaks with llvm 5?
+#BuildRequires:  pkgconfig(Qt5WebKitWidgets)
 
 BuildRequires:  libxslt-devel
+BuildRequires:  llvm-clang-devel >= 3.9
+BuildRequires:  llvm-devel >= 3.9
 BuildRequires:  python-devel >= 2.6
 BuildRequires:  python-setuptools
-BuildRequires:  llvm-devel >= 3.9
-BuildRequires:  llvm-clang-devel >= 3.9
 
 %description
 The PySide2 project provides Python bindings for the Qt
@@ -76,34 +118,43 @@
 
 %prep
 %setup -q -n pyside-setup-%{version}
-# currently broken
-sed -i '/qwebdatabase_wrapper.cpp/d' 
sources/pyside2/PySide2/QtWebKitWidgets/CMakeLists.txt
-sed -i '/qwebhistoryitem_wrapper.cpp/d' 
sources/pyside2/PySide2/QtWebKitWidgets/CMakeLists.txt
-sed -i '/QWebDatabase/d' 
sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml
-sed -i '/QWebHistoryItem/d' 
sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml
+%patch1 -p1
+%if "%{_libdir}" == "/usr/lib64"
+%patch2 -p1
+%endif
 
 %build
+export CFLAGS=-I/usr/include/linux
+%mypython setup.py build --reuse-build --ignore-git \
+%if %{with tests}
+  --build-tests
+%endif
 
 %install
-python setup.py install --reuse-build --prefix=%{_prefix} --root=%{buildroot}
+%mypython setup.py install --reuse-build --ignore-git --prefix=%{_prefix} 
--root=%{buildroot} \
+%if %{with tests}
+  --build-tests
+%endif
+
 # and hack re-installation, since setup is doing it wrong
 rm -rf %{buildroot}/*
 mkdir -p %{buildroot}/%{_libdir}
-cp -a ./pyside2_install/py*-release/* %{buildroot}%{_prefix}/
+cp -a ./pyside?_install/py*-release/* %{buildroot}%{_prefix}/
 
-sed -i 's,=.*/pyside2_install/[^\/]*,=/usr,' 
%{buildroot}%{_prefix}/lib/pkgconfig/*.pc
+sed -i 's,=.*/pyside._install/[^\/]*,=/usr,' 
%{buildroot}%{_prefix}/lib/pkgconfig/*.pc
 sed -i 's,^libdir=.*,libdir=%{_libdir},' 
%{buildroot}%{_prefix}/lib/pkgconfig/*.pc
 
-sed -i 's,".*/include/shiboken2","/usr/include/shiboken2",' 
%{buildroot}%{_prefix}/lib/cmake/Shiboken*/Shiboken2Config.cmake
-sed -i 's,".*/lib/libshiboken2.so","%{_libdir}/libshiboken2.so",' 
%{buildroot}%{_prefix}/lib/cmake/Shiboken*/Shiboken2Config.cmake
-sed -i 's,".*/bin/shiboken2","%{_prefix}/bin/shiboken2",' 
%{buildroot}%{_prefix}/lib/cmake/Shiboken*/Shiboken2Config.cmake
-sed -i 's,".*/bin/shiboken2","%{_prefix}/bin/shiboken2",' 
%{buildroot}%{_prefix}/lib/cmake/Shiboken*/Shiboken2Config.cmake
-
-
-sed -i 's,".*/include/PySide2","/usr/include/PySide2",' 
%{buildroot}%{_prefix}/lib/cmake/PySide2*/PySide2Config.cmake
-sed -i 's,".*/lib/libpyside2.so","%{_libdir}/libpyside2.so",' 
%{buildroot}%{_prefix}/lib/cmake/PySide2*/PySide2Config.cmake
-sed -i 's,"*/\(python.*/site-packages\)","%{_libdir}/\1",' 
%{buildroot}%{_prefix}/lib/cmake/PySide2*/PySide2Config.cmake
-sed -i 
's,"*/share/PySide2/typesystems","%{_prefix}/share/PySide2/typesystems",' 
%{buildroot}%{_prefix}/lib/cmake/PySide2*/PySide2Config.cmake
+sed -i 's,"[^"]*/include/shiboken2","/usr/include/shiboken2",' 
%{buildroot}%{_prefix}/lib/cmake/Shiboken*/*.cmake
+sed -i 's,"[^"]*/lib/libshiboken2.\(.*\)","%{_libdir}/libshiboken2.\1",' 
%{buildroot}%{_prefix}/lib/cmake/Shiboken*/*.cmake
+sed -i 's,"[^"]*/bin/shiboken2","%{_prefix}/bin/shiboken2",' 
%{buildroot}%{_prefix}/lib/cmake/Shiboken*/*.cmake
+sed -i 's,^include("[^"]*-release/lib/,include("%{_libdir}/,' 
%{buildroot}%{_prefix}/lib/cmake/Shiboken*/*.cmake
+
+sed -i 's,"[^"]*/include/PySide2","/usr/include/PySide2",' 
%{buildroot}%{_prefix}/lib/cmake/PySide2*/*.cmake
+sed -i 's,"[^"]*/lib/cmake/\(.*\)","%{_libdir}/cmake/\1",' 
%{buildroot}%{_prefix}/lib/cmake/PySide2*/*.cmake
+sed -i 's,"[^"]*/lib/libpyside2\.\(.*\)","%{_libdir}/libpyside2.\1",' 
%{buildroot}%{_prefix}/lib/cmake/PySide2*/*.cmake
+sed -i 's,"[^"]*/\(python.*/site-packages\)","%{_libdir}/\1",' 
%{buildroot}%{_prefix}/lib/cmake/PySide2*/*.cmake
+sed -i 
's,"[^"]*/share/PySide2/typesystems","%{_prefix}/share/PySide2/typesystems",' 
%{buildroot}%{_prefix}/lib/cmake/PySide2*/*.cmake
+sed -i 's,^include("[^"]*-release/lib/,include("%{_libdir}/,' 
%{buildroot}%{_prefix}/lib/cmake/PySide2*/*.cmake
 
 %if "%{_libdir}" == "/usr/lib64"
 mv %{buildroot}%{_prefix}/lib/lib* %{buildroot}/%{_libdir}/
@@ -112,6 +163,11 @@
 rmdir %{buildroot}%{_prefix}/lib
 %endif
 
+%check
+%if %{with tests}
+%mypython testrunner.py test
+%endif
+
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
@@ -119,8 +175,12 @@
 %defattr(-,root,root)
 %doc LICENSE.*
 %{_prefix}/bin/*
-%{py_sitedir}/*
 %{_libdir}/*.so.*
+%if "@BUILD_FLAVOR@" == "python3-pyside2"
+%{python3_sitearch}/*
+%else
+%{py_sitedir}/*
+%endif
 
 %files devel
 %defattr(-,root,root)
@@ -130,3 +190,5 @@
 %{_libdir}/cmake
 %{_libdir}/pkgconfig
 %{_datadir}/PySide2
+
+%changelog

++++++ _multibuild ++++++
<multibuild>
<!-- python2 version is building, but conflicts on installation time.
     so disabled until someone needs it...
  <package>python2-pyside2</package>
-->
  <package>python3-pyside2</package>
</multibuild>

++++++ _service ++++++
--- /var/tmp/diff_new_pack.SxXVlS/_old  2018-03-13 10:25:13.899205556 +0100
+++ /var/tmp/diff_new_pack.SxXVlS/_new  2018-03-13 10:25:13.899205556 +0100
@@ -1,8 +1,8 @@
 <services>
   <service name="obs_scm" mode="disabled">
-    <param 
name="url">https://codereview.qt-project.org/pyside/pyside-setup.git</param>
+    <param name="url">https://code.qt.io/pyside/pyside-setup.git</param>
     <param name="scm">git</param>
-    <param name="revision">5.9</param> <!-- the revision is the Qt branch, not 
our version -->
+    <param name="revision">dev</param>
     <param name="versionprefix">2.0~pre</param>
   </service>
   <service mode="disabled" name="set_version" />

++++++ fix-cmake.patch ++++++
diff --git a/sources/pyside2/libpyside/PySide2Config.cmake.in 
b/sources/pyside2/libpyside/PySide2Config.cmake.in
index 352a8999..7969ea50 100644
--- a/sources/pyside2/libpyside/PySide2Config.cmake.in
+++ b/sources/pyside2/libpyside/PySide2Config.cmake.in
@@ -2,4 +2,4 @@ if (NOT PYTHON_CONFIG_SUFFIX)
     message(STATUS "PySide2Config: Using default python: 
@SHIBOKEN_PYTHON_CONFIG_SUFFIX@")
     SET(PYTHON_CONFIG_SUFFIX @SHIBOKEN_PYTHON_CONFIG_SUFFIX@)
 endif()
-include(@LIB_INSTALL_DIR@/cmake/PySide2-@BINDING_API_VERSION@/PySide2Config${PYTHON_CONFIG_SUFFIX}.cmake)
+include("@LIB_INSTALL_DIR@/cmake/PySide2-@BINDING_API_VERSION@/PySide2Config${PYTHON_CONFIG_SUFFIX}.cmake")
++++++ lib64.patch ++++++
diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt
index 006924ad..b525cc4d 100644
--- a/sources/shiboken2/CMakeLists.txt
+++ b/sources/shiboken2/CMakeLists.txt
@@ -103,7 +103,7 @@ endif()
 message(STATUS "CLANG: ${CLANG_DIR}, ${CLANG_LIBRARY} detected by 
${CLANG_DIR_SOURCE}")
 
 # Find highest version clang builtin includes folder to pass along to shiboken.
-set(CLANG_BUILTIN_INCLUDES_DIR_PREFIX ${CLANG_DIR}/lib/clang)
+set(CLANG_BUILTIN_INCLUDES_DIR_PREFIX ${CLANG_DIR}/lib64/clang)
 file(GLOB CLANG_BUILTIN_INCLUDES_DIR_VERSIONS 
"${CLANG_BUILTIN_INCLUDES_DIR_PREFIX}/*")
 
 # Sort in alphabetical order the list of version folders.
++++++ pyside-setup-2.0~pre.1497016158.a3e4e367.obscpio -> 
pyside-setup-2.0~pre.1519723362.e621f811.obscpio ++++++
/work/SRC/openSUSE:Factory/python-pyside2/pyside-setup-2.0~pre.1497016158.a3e4e367.obscpio
 
/work/SRC/openSUSE:Factory/.python-pyside2.new/pyside-setup-2.0~pre.1519723362.e621f811.obscpio
 differ: char 10, line 1

++++++ pyside-setup.obsinfo ++++++
--- /var/tmp/diff_new_pack.SxXVlS/_old  2018-03-13 10:25:13.971202976 +0100
+++ /var/tmp/diff_new_pack.SxXVlS/_new  2018-03-13 10:25:13.971202976 +0100
@@ -1,5 +1,5 @@
 name: pyside-setup
-version: 2.0~pre.1497016158.a3e4e367
-mtime: 1497016158
-commit: a3e4e367cf462e2dd9d7b08fe8d3f0007c33e1fa
+version: 2.0~pre.1519723362.e621f811
+mtime: 1519723362
+commit: e621f81115cec5089f30755e09b9a59ece39660c
 


Reply via email to