Accepting request 846246 from KDE:Qt5

- Use sip5 where possible

OBS-URL: https://build.opensuse.org/request/show/846246
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-qtcharts-qt5?expand=0&rev=7

python-qtcharts-qt5.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 14 17:22:06 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
+
+- Use sip5 where possible 
+
 -------------------------------------------------------------------
 Mon Sep 14 17:21:15 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
 

python-qtcharts-qt5.spec

@@ -16,8 +16,14 @@
 #
 
 
+%if 0%{suse_version} < 1550
+%define use_sip4 1
+%endif
+
+%define oldpython python
+%define mname qtcharts-qt5
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-Name:           python-qtcharts-qt5
+Name:           python-%{mname}
 Version:        5.15.1
 Release:        0
 Summary:        Python bindings for the Qt5 Charts library
@@ -27,95 +33,84 @@ URL:            https://www.riverbankcomputing.com/software/pyqtchart/intro
 Source:         https://files.pythonhosted.org/packages/source/P/PyQtChart/PyQtChart-%{version}.tar.gz
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module qt5-devel}
-BuildRequires:  %{python_module sip-devel >= 4.19.1}
+BuildRequires:  fdupes
+BuildRequires:  python-pyqt-rpm-macros
 BuildRequires:  python-rpm-macros
 BuildRequires:  pkgconfig(Qt5Charts)
-Requires:       python-qt5
+%if 0%{?use_sip4}
+BuildRequires:  %{python_module sip4-devel >= 4.19.1}
 Requires:       python-sip(api) = %{python_sip_api_ver}
+%else
+BuildRequires:  %{python_module pyqt-builder}
+BuildRequires:  %{python_module sip-devel >= 5.3}
+%requires_eq    python-qt5-sip
+%endif
+Requires:       python-qt5
 
 %python_subpackages
 
 %description
 PyQtChart is a set of Python bindings for the Qt5 Charts library.
 
-%package     -n %{name}-api
+%package        api
 Summary:        Eric API files for %{name}
 Group:          Development/Tools/IDE
-Provides:       %{python_module qtcharts-qt5-api = %{version}}
+Supplements:    packageand(eric:python-%{mname})
-Supplements:    packageand(eric:%{python2_prefix}-qtcharts-qt5)
-Supplements:    packageand(eric:python3-qtcharts-qt5)
-BuildArch:      noarch
 
-%description -n %{name}-api
+%description    api
 This package provides Qt5 Charts library API files for the Eric IDE.
 
-%package     -n %{name}-sip
+%package sip
 Summary:        Sip files for %{name}
 Group:          Development/Libraries/Python
-Provides:       %{python_module qtcharts-qt5-sip = %{version}}
+Supplements:    packageand(python-sip:python-%{mname}) 
-Supplements:    packageand(%{python2_prefix}-sip:%{python2_prefix}-qtcharts-qt5)
+Provides:       %{oldpython}-%{mname}-sip = %{version}-%{release}
-Supplements:    packageand(python3-sip:python3-qtcharts-qt5)
+Obsoletes:      %{oldpython}-%{mname}-sip < %{version}-%{release}
-BuildArch:      noarch
+Requires:       python-qt5-devel
 
-%description -n %{name}-sip
+%description sip
-This package contains sip files used to generate
+This package provides the SIP files used to generate the Python bindings for
-bindings to the Qt5 Charts library.
+%{name}
 
-%package     -n %{name}-examples
+%package doc
 Summary:        Examples for %{name}
 Group:          Documentation/Other
-Provides:       %{python_module qtcharts-qt5-examples = %{version}}
+Provides:       %{python_module %{mname}-examples = %{version}-%{release}}
 BuildArch:      noarch
 
-%description -n %{name}-examples
+%description doc
 This package provides %{name} examples.
 
 %prep
 %setup -q -n PyQtChart-%{version}
-%{python_expand mkdir build_%{$python_bin_suffix}
-cp *.py build_%{$python_bin_suffix}
-cp -r sip build_%{$python_bin_suffix}
-}
 
 %build
-%{python_expand pushd build_%{$python_bin_suffix}
+%pyqt_build
-$python configure.py \
-    --no-dist-info \
-    --no-stubs \
-    --qmake=%{_bindir}/qmake-qt5
-
-make %{?_smp_mflags}
-popd
-}
 
 %install
-%{python_expand pushd build_%{$python_bin_suffix}
+%pyqt_install
-%make_install INSTALL_ROOT=%{buildroot}
+%pyqt_install_examples %mname
-popd
-}
-mkdir -p %{buildroot}%{_docdir}/%{name}
-find examples -type f -executable -exec sed -i '1s=^#!%{_bindir}/\(python\|env python\)3\?=#!%{_bindir}/python3=' {} +
-cp -r examples %{buildroot}%{_docdir}/%{name}
 
 %files %{python_files}
 %license LICENSE
 %doc NEWS README
 %dir %{python_sitearch}/PyQt5/
-%{python_sitearch}/PyQt5/QtChart.so
+%{python_sitearch}/PyQt5/QtChart.*
-%exclude %{_docdir}/%{name}/examples/
+%{python_sitearch}/PyQtChart-%{version}.dist-info
 
-%files -n %{name}-api
+%files %{python_files api}
 %license LICENSE
-%dir %{_datadir}/qt5/qsci/api/python/
+%dir %{_datadir}/qt5/qsci/api/python_%{python_bin_suffix}/
-%{_datadir}/qt5/qsci/api/python/PyQtChart.api
+%{_datadir}/qt5/qsci/api/python_%{python_bin_suffix}/PyQtChart.api
 
-%files -n %{name}-sip
+%files %{python_files sip}
 %license LICENSE
-%{_datadir}/sip/PyQt5/QtChart/
+%{pyqt5_sipdir}/QtChart/
 
-%files -n %{name}-examples
+%files %{python_files doc}
 %license LICENSE
-%dir %{_docdir}/%{name}/
+%{_docdir}/%{python_prefix}-%{mname}
-%{_docdir}/%{name}/examples/
+%exclude %{_docdir}/%{python_prefix}-%{mname}/NEWS
+%exclude %{_docdir}/%{python_prefix}-%{mname}/README
 
 %changelog