From e790006daffb8fda396d937a55e42f95bd121822 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 24 Aug 2018 14:13:57 -0500 Subject: [PATCH] drop backward-compat py3_sipdir drop dep on python?-sip, rely only on python?-pyqt?-sip-api move versioned qt5/sip-api deps to -base --- python-qt5.spec | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/python-qt5.spec b/python-qt5.spec index c054b22..c130c9f 100644 --- a/python-qt5.spec +++ b/python-qt5.spec @@ -16,11 +16,11 @@ %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) -# f29+ no longer using separate sipdir for python3 +## f29+ no longer using separate sipdir for python3 %global py3_sipdir %{_datadir}/sip/PyQt5 -%if 0%{?fedora} < 29 -%global py3_sipdir %{_datadir}/python3-sip/PyQt5 -%endif +#if 0%{?fedora} < 29 +#global py3_sipdir %{_datadir}/python3-sip/PyQt5 +#endif # see also https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JQQ66XJSIT2FGTK2YQY7AXMEH5IXMPUX/ %undefine _strict_symbol_defs_build @@ -30,7 +30,7 @@ Summary: PyQt5 is Python bindings for Qt5 Name: python-qt5 Version: 5.11.3 -Release: 0.1.%{snap}%{?dist} +Release: 0.2.%{snap}%{?dist} License: GPLv3 Url: http://www.riverbankcomputing.com/software/pyqt/ @@ -86,17 +86,14 @@ BuildRequires: python2-enum34 %endif BuildRequires: %{python2_dbus} %global sip_ver 4.19.12 -BuildRequires: sip >= %{sip_ver} BuildRequires: python2-pyqt5-sip >= %{sip_ver} -BuildRequires: python2-sip >= %{sip_ver} BuildRequires: python2-sip-devel >= %{sip_ver} %if 0%{?with_python3} BuildRequires: python%{python3_pkgversion}-devel python%{python3_pkgversion} BuildRequires: python%{python3_pkgversion}-enum34 -BuildRequires: python%{python3_pkgversion}-pyqt5-sip >= %{sip_ver} -BuildRequires: python%{python3_pkgversion}-sip >= %{sip_ver} -BuildRequires: python%{python3_pkgversion}-sip-devel >= %{sip_ver} BuildRequires: python%{python3_pkgversion}-dbus +BuildRequires: python%{python3_pkgversion}-pyqt5-sip >= %{sip_ver} +BuildRequires: python%{python3_pkgversion}-sip-devel >= %{sip_ver} %endif # with_python3 # when split out @@ -113,8 +110,6 @@ Obsoletes: python-qt5 < 5.5.1-10 Summary: Python 2 bindings for Qt5 Requires: python2-qt5-base%{?_isa} = %{version}-%{release} BuildRequires: qt5-qtbase-private-devel -%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} -%{?_sip_api:Requires: python2-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}} Requires: python2-enum34 Provides: PyQt5 = %{version}-%{release} Provides: PyQt5%{?_isa} = %{version}-%{release} @@ -128,8 +123,12 @@ Provides: python2-PyQt5%{?_isa} = %{version}-%{release} %package -n python2-qt5-base Summary: Python bindings for Qt5 base Requires: %{name}-rpm-macros = %{version}-%{release} +%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} +%{?_sip_api:Requires: python2-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}} Requires: %{python2_dbus} Obsoletes: python-qt5 < 5.5.1-10 +Provides: python2-PyQt5-base = %{version}-%{release} +Provides: python2-PyQt5-base%{?_isa} = %{version}-%{release} %{?python_provide:%python_provide python2-qt5-base} %description -n python2-qt5-base %{summary}. @@ -157,8 +156,6 @@ BuildArch: noarch %package -n python%{python3_pkgversion}-qt5 Summary: Python 3 bindings for Qt5 -%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} -%{?_sip_api:Requires: python%{python3_pkgversion}-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}} # when split out %if 0%{?webengine} || 0%{?webkit} Obsoletes: python3-qt5 < 5.5.1-10 @@ -508,6 +505,11 @@ sed -i \ %changelog +* Fri Aug 24 2018 Rex Dieter - 5.11.3-0.2.dev1808131157 +- drop backward-compat py3_sipdir +- drop dep on python?-sip, rely only on python?-pyqt?-sip-api +- move versioned qt5/sip-api deps to -base + * Tue Aug 14 2018 Rex Dieter - 5.11.3-0.1.dev1808131157 - 5.11.3.dev1808131157 snapshot - enable dist-info, include in -base (#1558187)