rpms/python-qt5
7
0
Fork 0
Code Issues Pull Requests Releases Activity

drop backward-compat py3_sipdir

Browse Source 
drop dep on python?-sip, rely only on python?-pyqt?-sip-api
move versioned qt5/sip-api deps to -base
This commit is contained in:
Rex Dieter 2018-08-24 14:13:57 -05:00
parent 8117cd5d84
commit e790006daf
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
python-qt5.spec
View File

@ -16,11 +16,11 @@
%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) %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 %global py3_sipdir %{_datadir}/sip/PyQt5
%if 0%{?fedora} < 29 #if 0%{?fedora} < 29
%global py3_sipdir %{_datadir}/python3-sip/PyQt5 #global py3_sipdir %{_datadir}/python3-sip/PyQt5
%endif #endif
# see also https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JQQ66XJSIT2FGTK2YQY7AXMEH5IXMPUX/ # see also https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JQQ66XJSIT2FGTK2YQY7AXMEH5IXMPUX/
%undefine _strict_symbol_defs_build %undefine _strict_symbol_defs_build
@ -30,7 +30,7 @@
Summary: PyQt5 is Python bindings for Qt5 Summary: PyQt5 is Python bindings for Qt5
Name: python-qt5 Name: python-qt5
Version: 5.11.3 Version: 5.11.3
Release: 0.1.%{snap}%{?dist} Release: 0.2.%{snap}%{?dist}
License: GPLv3 License: GPLv3
Url: http://www.riverbankcomputing.com/software/pyqt/ Url: http://www.riverbankcomputing.com/software/pyqt/
@ -86,17 +86,14 @@ BuildRequires: python2-enum34
%endif %endif
BuildRequires: %{python2_dbus} BuildRequires: %{python2_dbus}
%global sip_ver 4.19.12 %global sip_ver 4.19.12
BuildRequires: sip >= %{sip_ver}
BuildRequires: python2-pyqt5-sip >= %{sip_ver} BuildRequires: python2-pyqt5-sip >= %{sip_ver}
BuildRequires: python2-sip >= %{sip_ver}
BuildRequires: python2-sip-devel >= %{sip_ver} BuildRequires: python2-sip-devel >= %{sip_ver}
%if 0%{?with_python3} %if 0%{?with_python3}
BuildRequires: python%{python3_pkgversion}-devel python%{python3_pkgversion} BuildRequires: python%{python3_pkgversion}-devel python%{python3_pkgversion}
BuildRequires: python%{python3_pkgversion}-enum34 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}-dbus
BuildRequires: python%{python3_pkgversion}-pyqt5-sip >= %{sip_ver}
BuildRequires: python%{python3_pkgversion}-sip-devel >= %{sip_ver}
%endif # with_python3 %endif # with_python3
# when split out # when split out
@ -113,8 +110,6 @@ Obsoletes: python-qt5 < 5.5.1-10
Summary: Python 2 bindings for Qt5 Summary: Python 2 bindings for Qt5
Requires: python2-qt5-base%{?_isa} = %{version}-%{release} Requires: python2-qt5-base%{?_isa} = %{version}-%{release}
BuildRequires: qt5-qtbase-private-devel 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 Requires: python2-enum34
Provides: PyQt5 = %{version}-%{release} Provides: PyQt5 = %{version}-%{release}
Provides: PyQt5%{?_isa} = %{version}-%{release} Provides: PyQt5%{?_isa} = %{version}-%{release}
@ -128,8 +123,12 @@ Provides: python2-PyQt5%{?_isa} = %{version}-%{release}
%package -n python2-qt5-base %package -n python2-qt5-base
Summary: Python bindings for Qt5 base Summary: Python bindings for Qt5 base
Requires: %{name}-rpm-macros = %{version}-%{release} 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} Requires: %{python2_dbus}
Obsoletes: python-qt5 < 5.5.1-10 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} %{?python_provide:%python_provide python2-qt5-base}
%description -n python2-qt5-base %description -n python2-qt5-base
%{summary}. %{summary}.
@ -157,8 +156,6 @@ BuildArch: noarch
%package -n python%{python3_pkgversion}-qt5 %package -n python%{python3_pkgversion}-qt5
Summary: Python 3 bindings for 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 # when split out
%if 0%{?webengine} || 0%{?webkit} %if 0%{?webengine} || 0%{?webkit}
Obsoletes: python3-qt5 < 5.5.1-10 Obsoletes: python3-qt5 < 5.5.1-10
@ -508,6 +505,11 @@ sed -i \
%changelog %changelog
* Fri Aug 24 2018 Rex Dieter <rdieter@fedoraproject.org> - 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 <rdieter@fedoraproject.org> - 5.11.3-0.1.dev1808131157 * Tue Aug 14 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.3-0.1.dev1808131157
- 5.11.3.dev1808131157 snapshot - 5.11.3.dev1808131157 snapshot
- enable dist-info, include in -base (#1558187) - enable dist-info, include in -base (#1558187)