Hello community,
here is the log from the commit of package python-pyside-shiboken for
openSUSE:Factory checked in at 2015-09-08 17:39:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2014-11-12 00:22:11.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.python-pyside-shiboken.new/python-pyside-shiboken.changes
2015-09-08 17:44:08.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Aug 5 20:04:35 UTC 2015 - [email protected]
+
+- Specfile clean-up:
+ * Added symlinks to get rid of warnings
+ * Added python-Sphinx to get proper documentation
+
+-------------------------------------------------------------------
---
/work/SRC/openSUSE:Factory/python-pyside-shiboken/python3-pyside-shiboken.changes
2014-11-12 00:22:11.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.python-pyside-shiboken.new/python3-pyside-shiboken.changes
2015-09-08 17:44:08.000000000 +0200
@@ -1,0 +2,17 @@
+Sun Jul 19 22:08:15 UTC 2015 - [email protected]
+
+- Added patch for fixing version suffix:
+ shiboken-fix-include-with-suffix.patch
+ Reported upstream: https://bugreports.qt.io/browse/PYSIDE-279
+- Fixed alternatives for suffix version and removed some warnings
+- Fixed "Conflicts": Can not be installed with python2 version of
+ shiboken devel package.
+
+-------------------------------------------------------------------
+Sun Jan 10 00:51:53 UTC 2015 - [email protected]
+
+- specfile:
+ * update copyright year
+ * remove ifs for opensuse version <=1220
+
+-------------------------------------------------------------------
New:
----
shiboken-fix-include-with-suffix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pyside-shiboken.spec ++++++
--- /var/tmp/diff_new_pack.WW7wJJ/_old 2015-09-08 17:44:10.000000000 +0200
+++ /var/tmp/diff_new_pack.WW7wJJ/_new 2015-09-08 17:44:10.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-pyside-shiboken
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -38,6 +38,7 @@
BuildRequires: libqt4-devel
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
+BuildRequires: python-Sphinx
BuildRequires: python-devel
Obsoletes: libapiextractor < %{version}
Provides: libapiextractor = %{version}
@@ -67,8 +68,9 @@
%package doc
Summary: Documentation for %{name}
License: GPL-2.0
-Group: Development/Libraries/C and C++
+Group: Documentation/HTML
Recommends: %{libname} = %{version}
+BuildArch: noarch
%description doc
Documentation and manuals for %{name}
@@ -94,22 +96,23 @@
%setup -q -n %{tarname}-%{version}
%build
-mkdir build
-pushd build
-cmake .. \
- -DCMAKE_INSTALL_PREFIX=%{_prefix} \
- -DLIB_SUFFIX=$(echo %{_lib} | cut -b4-) \
- -DCMAKE_BUILD_TYPE=Debug \
+%cmake -DCMAKE_BUILD_TYPE=Debug \
-DBUILD_TESTS=False
make %{?_smp_mflags}
make doc
%install
-pushd build
+cd build
%makeinstall DESTDIR=%{buildroot}
mv %{buildroot}%{_bindir}/%{tarname}
%{buildroot}%{_bindir}/%{tarname}-%{py_ver}
mv %{buildroot}%{_mandir}/man1/%{tarname}.1
%{buildroot}%{_mandir}/man1/%{tarname}-%{py_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
+%endif
%pre
[ -h %{_bindir}/%{tarname} ] || rm -f %{_bindir}/%{tarname}
@@ -133,14 +136,11 @@
%files
%defattr(-,root,root)
%doc COPYING ChangeLog
-%if 0%{?suse_version} >= 1230
%ghost %{_sysconfdir}/alternatives/%{tarname}
%ghost %{_sysconfdir}/alternatives/%{tarname}.1
-%endif
-%ghost %{_bindir}/%{tarname}
-%{_bindir}/%{tarname}-%{py_ver}
-%{_mandir}/man1/%{tarname}-%{py_ver}.1.gz
-%ghost %{_mandir}/man1/%{tarname}.1.gz
+%ghost %{_sysconfdir}/alternatives/%{tarname}.1.gz
+%{_bindir}/%{tarname}*
+%{_mandir}/man1/%{tarname}*.1.gz
%{python_sitearch}/%{tarname}.so
%files -n %{libname}
@@ -151,7 +151,7 @@
%files doc
%defattr(-,root,root)
%doc COPYING
-%doc doc/
+%doc build/doc/html/*
%files -n %{libprefix}-devel
%defattr(-,root,root)
++++++ python3-pyside-shiboken.spec ++++++
--- /var/tmp/diff_new_pack.WW7wJJ/_old 2015-09-08 17:44:10.000000000 +0200
+++ /var/tmp/diff_new_pack.WW7wJJ/_new 2015-09-08 17:44:10.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python3-pyside-shiboken
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -32,17 +32,17 @@
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
+# PATCH-FIX shiboken-fix-include-with-suffix [email protected] -- 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
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: libqt4-devel
-BuildRequires: python3-devel
-%if 0%{?suse_version} == 1220
-BuildRequires: python3-2to3
-%endif
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: python3-Sphinx
+BuildRequires: python3-devel
Requires: %{libname} = %{version}
Requires(post): update-alternatives
Requires(postun): update-alternatives
@@ -65,7 +65,8 @@
%package doc
Summary: Documentation for %{name}
License: GPL-2.0
-Group: Development/Libraries/C and C++
+Group: Documentation/HTML
+BuildArch: noarch
%description doc
Documentation and manuals for %{name}
@@ -83,21 +84,17 @@
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}-python3-devel
+Conflicts: lib%{tarname}-devel
%description -n %{libprefix}-python3-devel
Development libraries and headers needed to build software using %{name}
%prep
%setup -q -n %{tarname}-%{version}
+%patch0 -p1
%build
-mkdir build
-pushd build
-cmake .. \
- -DCMAKE_INSTALL_PREFIX=%{_prefix} \
- -DLIB_SUFFIX=$(echo %{_lib} | cut -b4-) \
- -DCMAKE_BUILD_TYPE=Debug \
+%cmake -DCMAKE_BUILD_TYPE=Debug \
-DBUILD_TESTS=False \
-DENABLE_VERSION_SUFFIX=True \
-DUSE_PYTHON3=True
@@ -105,11 +102,18 @@
make doc
%install
-pushd build
+cd build
%makeinstall DESTDIR=%{buildroot}
-mv %{buildroot}%{_bindir}/%{tarname}
%{buildroot}%{_bindir}/%{tarname}-%{py3_ver}
+mv %{buildroot}%{_bindir}/%{tarname}-%{majorver}
%{buildroot}%{_bindir}/%{tarname}-%{py3_ver}
mv %{buildroot}%{_mandir}/man1/%{tarname}.1
%{buildroot}%{_mandir}/man1/%{tarname}-%{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}
+%endif
%pre
[ -h %{_bindir}/%{tarname} ] || rm -f %{_bindir}/%{tarname}
@@ -118,7 +122,8 @@
%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 %{_mandir}/man1/%{tarname}.1.gz %{tarname}.1
%{_mandir}/man1/%{tarname}-%{py3_ver}.1.gz \
+ --slave %{_bindir}/%{tarname}-%{majorver}
%{tarname}-%{majorver} %{_bindir}/%{tarname}-%{py3_ver}
%preun
if [ $1 -eq 0 ] ; then
@@ -133,14 +138,12 @@
%files
%defattr(-,root,root)
%doc COPYING ChangeLog
-%if 0%{?suse_version} >= 1230
%ghost %{_sysconfdir}/alternatives/%{tarname}
+%ghost %{_sysconfdir}/alternatives/%{tarname}-%{majorver}
%ghost %{_sysconfdir}/alternatives/%{tarname}.1
-%endif
-%ghost %{_bindir}/%{tarname}
-%{_bindir}/%{tarname}-%{py3_ver}
-%ghost %{_mandir}/man1/%{tarname}.1.gz
-%{_mandir}/man1/%{tarname}-%{py3_ver}.1.gz
+%ghost %{_sysconfdir}/alternatives/%{tarname}.1.gz
+%{_bindir}/%{tarname}*
+%{_mandir}/man1/%{tarname}*.1.gz
%{python3_sitearch}/%{tarname}.so
%files -n %{libname}
@@ -151,13 +154,13 @@
%files doc
%defattr(-,root,root)
%doc COPYING
-%doc doc/
+%doc build/doc/html/*
%files -n %{libprefix}-python3-devel
%defattr(-,root,root)
%{_includedir}/%{tarname}-%{majorver}/
%{_libdir}/%{libpyname}.so
%{_libdir}/cmake/%{pyname}-%{version}/
-%{_libdir}/pkgconfig/%{tarname}.pc
+%{_libdir}/pkgconfig/%{tarname}-%{majorver}.pc
%changelog
++++++ shiboken-fix-include-with-suffix.patch ++++++
diff -Naur shiboken-1.2.2/CMakeLists.txt shiboken-1.2.2_fixed/CMakeLists.txt
--- shiboken-1.2.2/CMakeLists.txt 2014-04-22 17:42:48.000000000 +0200
+++ shiboken-1.2.2_fixed/CMakeLists.txt 2015-07-19 23:36:15.872381253 +0200
@@ -111,6 +111,13 @@
set(SBK_PYTHON_INCLUDE_DIR ${PYTHON_INCLUDE_DIRS})
endif()
+option(ENABLE_VERSION_SUFFIX "Used to use current version in suffix to
generated files. This is used to allow multiples versions installed
simultaneous." FALSE)
+if(ENABLE_VERSION_SUFFIX)
+ set(shiboken_SUFFIX "-${shiboken_MAJOR_VERSION}.${shiboken_MINOR_VERSION}")
+else()
+ set(shiboken_SUFFIX "")
+endif()
+
add_subdirectory(libshiboken)
add_subdirectory(doc)
diff -Naur shiboken-1.2.2/data/shiboken.pc.in
shiboken-1.2.2_fixed/data/shiboken.pc.in
--- shiboken-1.2.2/data/shiboken.pc.in 2014-04-22 17:42:48.000000000 +0200
+++ shiboken-1.2.2_fixed/data/shiboken.pc.in 2015-07-19 23:37:00.352077907
+0200
@@ -10,4 +10,4 @@
Description: Support library for Python bindings created with Shiboken
generator.
Version: @shiboken_VERSION@
Libs: @SBK_PYTHON_LIBRARIES@ -L${libdir}
-lshiboken@shiboken_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@
-Cflags: -I@SBK_PYTHON_INCLUDE_DIR@
-I${includedir}/@shiboken_SUFFIX@@SBK_PKG_CONFIG_PY_DEBUG_DEFINITION@
+Cflags: -I@SBK_PYTHON_INCLUDE_DIR@
-I${includedir}@shiboken_SUFFIX@@SBK_PKG_CONFIG_PY_DEBUG_DEFINITION@
diff -Naur shiboken-1.2.2/libshiboken/CMakeLists.txt
shiboken-1.2.2_fixed/libshiboken/CMakeLists.txt
--- shiboken-1.2.2/libshiboken/CMakeLists.txt 2014-04-22 17:42:48.000000000
+0200
+++ shiboken-1.2.2_fixed/libshiboken/CMakeLists.txt 2015-07-19
23:36:15.873381224 +0200
@@ -1,12 +1,5 @@
project(libshiboken)
-option(ENABLE_VERSION_SUFFIX "Used to use current version in suffix to
generated files. This is used to allow multiples versions installed
simultaneous." FALSE)
-if(ENABLE_VERSION_SUFFIX)
- set(shiboken_SUFFIX "-${shiboken_MAJOR_VERSION}.${shiboken_MINOR_VERSION}")
-else()
- set(shiboken_SUFFIX "")
-endif()
-
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sbkversion.h.in"
"${CMAKE_CURRENT_BINARY_DIR}/sbkversion.h" @ONLY)
diff -Naur shiboken-1.2.2/shibokenmodule/CMakeLists.txt
shiboken-1.2.2_fixed/shibokenmodule/CMakeLists.txt
--- shiboken-1.2.2/shibokenmodule/CMakeLists.txt 2014-04-22
17:42:48.000000000 +0200
+++ shiboken-1.2.2_fixed/shibokenmodule/CMakeLists.txt 2015-07-19
23:36:15.873381224 +0200
@@ -9,7 +9,7 @@
)
add_custom_command(OUTPUT ${sample_SRC}
-COMMAND ${shibokengenerator_BINARY_DIR}/shiboken
--project-file=${CMAKE_CURRENT_BINARY_DIR}/shibokenmodule.txt
${GENERATOR_EXTRA_FLAGS}
+COMMAND ${shibokengenerator_BINARY_DIR}/shiboken${shiboken_SUFFIX}
--project-file=${CMAKE_CURRENT_BINARY_DIR}/shibokenmodule.txt
${GENERATOR_EXTRA_FLAGS}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "Running generator for 'shiboken'..."
)
