commit python-pyside-shiboken for openSUSE:Factory

Hello community, here is the log from the commit of package python-pyside-shiboken for openSUSE:Factory checked in at 2016-03-26 15:23:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pyside-shiboken (Old) and /work/SRC/openSUSE:Factory/.python-pyside-shiboken.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pyside-shiboken" Changes: -------- --- /work/SRC/openSUSE:Factory/python-pyside-shiboken/python-pyside-shiboken.changes 2015-09-08 17:44:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-pyside-shiboken.new/python-pyside-shiboken.changes 2016-03-26 15:23:41.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Oct 26 21:19:27 UTC 2015 - rpm@fthiessen.de + +- Updated to upstream release 1.2.4: + * Don’t ignore classes in topology + * Process global enums in declaration order + * Return enums in declaration order (order added) +- Spec cleanup: + * fixed depencencies to get rid of warnings + * RelWithDebInfo instead of Debug to get optimizations AND the + debug information. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python-pyside-shiboken/python3-pyside-shiboken.changes 2015-09-08 17:44:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-pyside-shiboken.new/python3-pyside-shiboken.changes 2016-03-26 15:23:41.000000000 +0100 @@ -1,0 +2,15 @@ +Thu Jan 28 14:02:35 UTC 2016 - toddrme2178@gmail.com + +- Add shiboken-enable-python35.patch to allow building on + Python 3.5 +- Fix and simplify macros + +------------------------------------------------------------------- +Mon Oct 26 21:15:55 UTC 2015 - rpm@fthiessen.de + +- Updated to upstream release 1.2.4: + * Don’t ignore classes in topology + * Process global enums in declaration order + * Return enums in declaration order (order added) + +------------------------------------------------------------------- Old: ---- shiboken-1.2.2.tar.bz2 New: ---- shiboken-1.2.4.tar.gz shiboken-enable-python35.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pyside-shiboken.spec ++++++ --- /var/tmp/diff_new_pack.6kvFQC/_old 2016-03-26 15:23:42.000000000 +0100 +++ /var/tmp/diff_new_pack.6kvFQC/_new 2016-03-26 15:23:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-pyside-shiboken # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ %define tarname shiboken Name: python-pyside-%{tarname} -Version: 1.2.2 +Version: 1.2.4 Release: 0 %define majorver %(echo "%{version}" | sed 's/\\.[0-9]*$//') %define libsoname %(echo "%{majorver}" | sed 's/\\./_/') @@ -31,7 +31,7 @@ License: GPL-2.0 Group: Development/Libraries/C and C++ Url: http://qt-project.org/wiki/PySide -Source0: http://download.qt-project.org/official_releases/pyside/%{tarname}-%{version}.tar.bz2 +Source0: https://github.com/PySide/Shiboken/archive/%{version}/%{tarname}-%{version}.tar.gz BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -79,7 +79,7 @@ Summary: Development files for %{name} License: LGPL-2.1 Group: Development/Libraries/C and C++ -Recommends: %{libname} = %{version} +Requires: %{libname} = %{version} # As cmake config files are not python version agnostic, python2 and 3 versions of developement # package can't be installed at the same time Conflicts: lib%{tarname}-python3-devel @@ -93,10 +93,10 @@ Development libraries and headers needed to build software using %{name} %prep -%setup -q -n %{tarname}-%{version} +%setup -q -n Shiboken-%{version} %build -%cmake -DCMAKE_BUILD_TYPE=Debug \ +%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DBUILD_TESTS=False make %{?_smp_mflags} make doc @@ -135,7 +135,7 @@ %files %defattr(-,root,root) -%doc COPYING ChangeLog +%doc COPYING AUTHORS %ghost %{_sysconfdir}/alternatives/%{tarname} %ghost %{_sysconfdir}/alternatives/%{tarname}.1 %ghost %{_sysconfdir}/alternatives/%{tarname}.1.gz @@ -145,7 +145,7 @@ %files -n %{libname} %defattr(-,root,root) -%doc COPYING.%{libprefix} +%doc COPYING.%{libprefix} AUTHORS %{_libdir}/%{libpyname}.so.* %files doc ++++++ python3-pyside-shiboken.spec ++++++ --- /var/tmp/diff_new_pack.6kvFQC/_old 2016-03-26 15:23:42.000000000 +0100 +++ /var/tmp/diff_new_pack.6kvFQC/_new 2016-03-26 15:23:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3-pyside-shiboken # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,25 +16,23 @@ # -%define tarname shiboken -Name: python3-pyside-%{tarname} -%define pyname Shiboken -Version: 1.2.2 +Name: python3-pyside-shiboken +Version: 1.2.4 Release: 0 %define majorver %(echo "%{version}" | sed 's/\\.[0-9]*$//') %define libsoname %(echo "%{majorver}" | sed 's/\\./_/') -%define libprefix lib%{tarname} -%define pyver_mod2 %(python3 -c "import sys; sys.stdout.write(sys.version[:3].replace('.','')+sys.abiflags)") -%define libpyname %{libprefix}-%{majorver}.cpython-%{pyver_mod2} -%define libname %{libprefix}-%{libsoname}_cpython-%{pyver_mod2}%{libsoname} +%define libname libshiboken-%{libsoname}_%{py3_soflags}%{libsoname} Summary: Generate CPython 3 bindings from C++ code License: GPL-2.0 Group: Development/Libraries/C and C++ Url: http://qt-project.org/wiki/PySide -Source0: http://download.qt-project.org/official_releases/pyside/%{tarname}-%{version}.tar.bz2 +Source0: https://github.com/PySide/Shiboken/archive/%{version}/shiboken-%{version}.tar.gz # PATCH-FIX shiboken-fix-include-with-suffix rpm@fthiessen.de -- fixes .pc so include directory with suffix will be found. # Reported upstream: https://bugreports.qt.io/browse/PYSIDE-279 Patch0: shiboken-fix-include-with-suffix.patch +# PATCH-FIX-UPSTREAM shiboken-enable-python35 toddrme2178@gmail.com -- enables building with python 3.5 +# Reported upstream: https://github.com/PySide/Shiboken/issues/77 +Patch1: shiboken-enable-python35.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -71,7 +69,7 @@ %description doc Documentation and manuals for %{name} -%package -n %{libprefix}-python3-devel +%package -n libshiboken-python3-devel Summary: Development files for %{name} License: LGPL-2.1 Group: Development/Libraries/C and C++ @@ -84,17 +82,18 @@ Requires: python3-devel >= %{py3_ver} # As cmake config files are not python version agnostic, python2 and 3 versions of developement # package can't be installed at the same time -Conflicts: lib%{tarname}-devel +Conflicts: libshiboken-devel -%description -n %{libprefix}-python3-devel +%description -n libshiboken-python3-devel Development libraries and headers needed to build software using %{name} %prep -%setup -q -n %{tarname}-%{version} +%setup -q -n Shiboken-%{version} %patch0 -p1 +%patch1 -p1 %build -%cmake -DCMAKE_BUILD_TYPE=Debug \ +%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DBUILD_TESTS=False \ -DENABLE_VERSION_SUFFIX=True \ -DUSE_PYTHON3=True @@ -104,30 +103,30 @@ %install cd build %makeinstall DESTDIR=%{buildroot} -mv %{buildroot}%{_bindir}/%{tarname}-%{majorver} %{buildroot}%{_bindir}/%{tarname}-%{py3_ver} -mv %{buildroot}%{_mandir}/man1/%{tarname}.1 %{buildroot}%{_mandir}/man1/%{tarname}-%{py3_ver}.1 +mv %{buildroot}%{_bindir}/shiboken-%{majorver} %{buildroot}%{_bindir}/shiboken-%{py3_ver} +mv %{buildroot}%{_mandir}/man1/shiboken.1 %{buildroot}%{_mandir}/man1/shiboken-%{py3_ver}.1 %fdupes %{buildroot} # openSUSE 13.1 and lower have a bad bug with brp-symlink %if 0%{?suse_version} >= 1315 - ln -s %{_sysconfdir}/alternatives/%{tarname} %{buildroot}%{_bindir}/%{tarname} - ln -s %{_sysconfdir}/alternatives/%{tarname}.1 %{buildroot}%{_mandir}/man1/%{tarname}.1 - ln -s %{_sysconfdir}/alternatives/%{tarname}.1.gz %{buildroot}%{_mandir}/man1/%{tarname}.1.gz - ln -s %{_sysconfdir}/alternatives/%{tarname} %{buildroot}%{_bindir}/%{tarname}-%{majorver} + ln -s %{_sysconfdir}/alternatives/shiboken %{buildroot}%{_bindir}/shiboken + ln -s %{_sysconfdir}/alternatives/shiboken.1 %{buildroot}%{_mandir}/man1/shiboken.1 + ln -s %{_sysconfdir}/alternatives/shiboken.1.gz %{buildroot}%{_mandir}/man1/shiboken.1.gz + ln -s %{_sysconfdir}/alternatives/shiboken %{buildroot}%{_bindir}/shiboken-%{majorver} %endif %pre -[ -h %{_bindir}/%{tarname} ] || rm -f %{_bindir}/%{tarname} -[ -h %{_mandir}/man1/%{tarname}.1.gz ] || rm -f %{_mandir}/man1/%{tarname}.1.gz +[ -h %{_bindir}/shiboken ] || rm -f %{_bindir}/shiboken +[ -h %{_mandir}/man1/shiboken.1.gz ] || rm -f %{_mandir}/man1/shiboken.1.gz %post /sbin/ldconfig -update-alternatives --install %{_bindir}/%{tarname} %{tarname} %{_bindir}/%{tarname}-%{py3_ver} 20 \ - --slave %{_mandir}/man1/%{tarname}.1.gz %{tarname}.1 %{_mandir}/man1/%{tarname}-%{py3_ver}.1.gz \ - --slave %{_bindir}/%{tarname}-%{majorver} %{tarname}-%{majorver} %{_bindir}/%{tarname}-%{py3_ver} +update-alternatives --install %{_bindir}/shiboken shiboken %{_bindir}/shiboken-%{py3_ver} 20 \ + --slave %{_mandir}/man1/shiboken.1.gz shiboken.1 %{_mandir}/man1/shiboken-%{py3_ver}.1.gz \ + --slave %{_bindir}/shiboken-%{majorver} shiboken-%{majorver} %{_bindir}/shiboken-%{py3_ver} %preun if [ $1 -eq 0 ] ; then - update-alternatives --remove %{tarname} %{_bindir}/%{tarname}-%{py3_ver} + update-alternatives --remove shiboken %{_bindir}/shiboken-%{py3_ver} fi %postun -p /sbin/ldconfig @@ -137,30 +136,30 @@ %files %defattr(-,root,root) -%doc COPYING ChangeLog -%ghost %{_sysconfdir}/alternatives/%{tarname} -%ghost %{_sysconfdir}/alternatives/%{tarname}-%{majorver} -%ghost %{_sysconfdir}/alternatives/%{tarname}.1 -%ghost %{_sysconfdir}/alternatives/%{tarname}.1.gz -%{_bindir}/%{tarname}* -%{_mandir}/man1/%{tarname}*.1.gz -%{python3_sitearch}/%{tarname}.so +%doc COPYING AUTHORS +%ghost %{_sysconfdir}/alternatives/shiboken +%ghost %{_sysconfdir}/alternatives/shiboken-%{majorver} +%ghost %{_sysconfdir}/alternatives/shiboken.1 +%ghost %{_sysconfdir}/alternatives/shiboken.1.gz +%{_bindir}/shiboken* +%{_mandir}/man1/shiboken*.1.gz +%{python3_sitearch}/shiboken.so %files -n %{libname} %defattr(-,root,root) -%doc COPYING.%{libprefix} -%{_libdir}/%{libpyname}.so.* +%doc COPYING.libshiboken AUTHORS +%{_libdir}/libshiboken-%{majorver}.%{py3_soflags}.so.* %files doc %defattr(-,root,root) %doc COPYING %doc build/doc/html/* -%files -n %{libprefix}-python3-devel +%files -n libshiboken-python3-devel %defattr(-,root,root) -%{_includedir}/%{tarname}-%{majorver}/ -%{_libdir}/%{libpyname}.so -%{_libdir}/cmake/%{pyname}-%{version}/ -%{_libdir}/pkgconfig/%{tarname}-%{majorver}.pc +%{_includedir}/shiboken-%{majorver}/ +%{_libdir}/libshiboken-%{majorver}.%{py3_soflags}.so +%{_libdir}/cmake/Shiboken-%{version}/ +%{_libdir}/pkgconfig/shiboken-%{majorver}.pc %changelog ++++++ shiboken-enable-python35.patch ++++++

From f34a1497b8bc973d92d86ffee1fff0d9d2af88db Mon Sep 17 00:00:00 2001 From: toddrme2178 Date: Thu, 28 Jan 2016 14:58:45 +0100 Subject: [PATCH] Enable support for python 3.5

Add python 3.5 to the allowed python versions. --- cmake/Modules/FindPython3Libs.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Modules/FindPython3Libs.cmake b/cmake/Modules/FindPython3Libs.cmake index 20a82ba..4f1e102 100644 --- a/cmake/Modules/FindPython3Libs.cmake +++ b/cmake/Modules/FindPython3Libs.cmake @@ -27,7 +27,7 @@ INCLUDE(CMakeFindFrameworks) # Search for the python framework on Apple. # CMAKE_FIND_FRAMEWORKS(Python) -FOREACH(_CURRENT_VERSION 3.4 3.3 3.2 3.1 3.0) +FOREACH(_CURRENT_VERSION 3.5 3.4 3.3 3.2 3.1 3.0) IF(_CURRENT_VERSION GREATER 3.1) SET(_32FLAGS "m" "u" "mu" "dm" "du" "dmu" "") ELSE()